Better C++11 support.

Added a snippet found on Stack Overflow that adds some of the missing
C++11 support to C++ mode.
Merge remote-tracking branch 'origin/master'