Actually fixed bug.
Merge branch 'master' into Graphics