Added C++11 syntax support.
Merge branch 'master' into linux