Merge branch 'master' into release-2.2.2
Merge branch 'release-2.2.2' into develop
Fixes issue with QuickTag button not showing up in Firefox.
Bumps version number.
Updates pot file.
Updates changelog
Merge branch 'release-2.2.3'