hotfix of a previous 'fix' ;)
Merge branch 'master' into MotionBlur