Merge branch 'tk/stripspace' into maint