Fix error when game-state isn't present in XML
Merge branch 'master' into no-time-mod

* master:
  Fix error when game-state isn't present in XML