Merge branch 'standalone-emscripten' of https://github.com/nicolasnoble/imgui