Merge pull request #637 from Tenkiv/master

Fixes #636
Merge commit 'd408a924758638aab3929cf6ff295772d927d849' into scenegraph_dev