Whoops, missing semicolon.
Merge branch 'master' into beta

* master:
  Whoops, missing semicolon.