Merge "Temporary remove inlines to unbreak compilation with GCC 5"