still have been too stupid for key mappings ;)
Merge branch 'develop'

* develop:
  still have been too stupid for key mappings ;)