Code

Merge branch 'jc/advise-i18n' into maint-1.7.8