copy over from bitbucket version for github posting
Merge branch 'next'