Fixed a couple of missing defs
Merge pull request #798 from worktycho/warnings

Fixed Format string warnings
Merge pull request #805 from worktycho/undef

Fixed a couple of missing defs
Merge branch 'master' into globals

Conflicts:
	SetFlags.cmake