Merge branch 'incoming' into proxyGL
Merge branch 'proxyGL' of github.com:kripken/emscripten into proxyGL