Merge branch 'jk/stash-require-clean-index' into maint