ref: ddea34baa30138933e6bc2dd5333718666aaccb7
parent: a1cce65ba7e25544c3fa771687c7c8245f57fd89
parent: caf5fce9b29f3035b4c7d90ec68693487fc082be
author: Paul Brossier <piem@piem.org>
date: Mon Jul 24 10:09:57 EDT 2017
Merge branch 'emscripten'