intern commit
Merge branch 'master' into WorkLizzard
fix scaling in relation to Trackable
Merge branch 'WorkLizzard'