Merge branch 'master' into Editor-extension
Some plane fixes...
Merge branch 'Editor-extension'
Small fix for .png export