Merge emscripten branch