Merge branch 'nd/complete-format-patch'