Fixed a bug with Web build compatibility
Merge branch 'master' into Kongregate

* master:
  Fixed a bug with Web build compatibility