Merge branch 'master' of https://github.com/BabylonJS/Babylon.js

# Conflicts:
#	src/Canvas2d/babylon.canvas2d.ts