Merge branch 'libkeymap'