Merge emscripten into master