Small tweaks to help with webkit rendering engines
Merge branch 'origin/master'