Merge branch 'dm/maint-docco' into maint