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

Merge v1.7 content back to master.