Merge pull request #121 from open-power/master

Merge fixes from master back to master-next for v1.2.