Merge pull request #393 from open-power/master-next

Merge master-next content to master for v1.8