Merge conflict merging master into feature/require-pub-1.5

mrbelvedere tried to merge new commits to master but hit a merge conflict.  Please resolve manually