Merge tag 'ko-next' into next

I just rebuilt my 'next' branch from scratch, based on master without
the delta topics that were there.  This would rewind the head which is
a no-no.  This merges the original 'next' back in, to finish the "reverting"
of these two topic branches.
nothing to commit