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

Merge v1.2 content back to master.