Bug 893358 - Italian keyboard layout support

fix merge conflicts