#52 Was a fix that can not be touched during the transition scene.
Merge branch 'master' into dev