Code

Merge branch 'jc/maint-merge-autoedit' into maint