Merge branch 'master' into next
* master: Cauterize dropped or duplicate bits from next. Merge part of 'sp/checkout'maint
commit
3ab8532b07
* master: Cauterize dropped or duplicate bits from next. Merge part of 'sp/checkout'maint