Merge branch 'master' into emscripten
authorPaul Brossier <piem@piem.org>
Mon, 24 Jul 2017 12:09:22 +0000 (14:09 +0200)
committerPaul Brossier <piem@piem.org>
Mon, 24 Jul 2017 12:09:22 +0000 (14:09 +0200)

Trivial merge