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

Merge v1.6 content back to master.