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

Merge master-next to master for 1.12.