Adding warnings when using hacks
Merge branch 'master' into MasterSwitchHack