Merge pull request #473 from stewart-ibm/master-next-merge

Merge master into master-next