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

Merge v1.6 fixes back to master.