Merge "C++11 style fixups"