Bugfix for recent config changes.
Patch around integreity bug.
Merge branch 'master' into i18n