Bugfix I content scaling
Merge remote-tracking branch 'origin/master'