Merge "Fix C++11 violations"