Merge "Fix c++11 narrowing"