Removing some of C++11
Removing some of C++11
Merge branch 'gcc46' into develop