Merge branch 'jc/maint-1.6.3-graft-trailing-space' into maint