Merge branch 'PR/simplify_emscripten'
authorPaul Brossier <piem@piem.org>
Sun, 1 Oct 2017 01:27:07 +0000 (03:27 +0200)
committerPaul Brossier <piem@piem.org>
Sun, 1 Oct 2017 01:27:07 +0000 (03:27 +0200)

Trivial merge