Merge pull request #836 from open-power/master

Merge master back to master-next after v1.14.