am 2e9d50a9: (-s ours) Merge "Fix Catalan keyboard layout"

* commit '2e9d50a95d5648bffcf88da1ebec13cf58ce317f':
  Fix Catalan keyboard layout