small syntax fix
added additional null check
Merge remote-tracking branch 'giscloud/master'

Conflicts:
	jquery.hotkeys.js