Code

Merge branch 'jc/maint-apply-no-double-patch' into maint