Merge pull request #168 from open-power/master

Merge v1.2.1 fixes from master.