Merge pull request #1563 from seanpaultaylor/next

Next