Prevent default on return keydown
Merge branch 'master' into gh-pages