Changes for C++11/Clang errors
Merge branch 'master' of https://github.com/fix8/fix8
Merge branch 'master' of https://github.com/fix8/fix8
Merge branch 'master' of https://github.com/fix8/fix8

Conflicts:
	ChangeLog
Merge branch 'master' of https://github.com/fix8/fix8
FX-174 - tidy up for generated code include guards