Keypress to keyup (webkit browser does not fire esc key event on keypress)
Merge remote-tracking branch 'origin/master'