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

Merge master-next to master for v1.13.