Change from c++11 to c++0x.
Merge branch 'master' into validation