preprocessor should now pass C++11 check
Merge branches 'dev' and 'master'