Reverts back to '2720974 Merge fixes' to fix build.
Merge pull request #56 from Team-Combat-Wombat/dev-fix-dev

Reverts back to '2720974 Merge fixes' to fix build.