Merge branch 'master' into PR/simplify_emscripten
authorPaul Brossier <piem@piem.org>
Sat, 30 Sep 2017 18:22:13 +0000 (20:22 +0200)
committerPaul Brossier <piem@piem.org>
Sat, 30 Sep 2017 18:22:13 +0000 (20:22 +0200)

Trivial merge