fix minor glitch for ipad emulator
Merge branch 'master' into gh-pages