FX-41; Some C++11 changes
update from foss
more c++11
Merge branch 'dev' of github.com:fix8/fix8 into dev