Merge pull request #92 from open-power/master

Merge fixes from master to master-next.