Fixed upstream: http://cgit.freedesktop.org/xkeyboard-config/commit/?id=f0c4c16bf0fdb38494875dba117e38b363e99614