Fixed bug with viewport initial-scale
Merge branch 'master' into dev