Bug 963593 - [Australis] Stop scaling cut/copy/paste and zoom control icons on Retina. r=Gijs.
Bug 964064 - shortcuts should always be uppercase, r=Unfocused
merge fx-team to mozilla-central