Merge branch 'next'

Merge all outstanding changes from the current next branch in now that
we have released.