reduce flipping on hasty key pressing
Merge branch 'master' into gh-pages