[KeyMapping] updated

Although not tested yet, the buildbot seems broken :-/