Merge last emscripten update