Overflow hidden applied to body
Apply fix for PNG rendering
Consolidating some changes
Merge branch 'master' into build