Merge branch 'master' into 'master'

keymap-gen: Import sys

See merge request !1