Bugfixes to scene loading
Reduce CPU usage
Merge remote-tracking branch 'origin/master'