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

Merge v1.5 content back to master.