Merge branch feature/kim/emscripten with refs/heads/master into refs/merge-requests/541/train

3 jobs for !541 with feature/kim/emscripten into master in 24 minutes and 5 seconds (queued for 2 seconds)
merge train