Merge branch 'jc/submittingpatches' into maint