possible fix for ipad mass editing
Merge branch 'master' into gh-pages