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

Merge master-next to master for 1.11.