merge emscripten port
authorTaylor Richards <taylor@icculus.org>
Sat, 17 Mar 2018 15:58:19 +0000 (11:58 -0400)
committerTaylor Richards <taylor@icculus.org>
Sat, 17 Mar 2018 15:58:19 +0000 (11:58 -0400)

Trivial merge