Project file didn't save properly earlier. (This seems to happen frequently.)
Merge branch 'master' into game-mechanics-newarch