Fix for iOS viewport inconsistencies
Merge branch 'master' into gh-pages