Merge pull request #565 from open-power/master

Merge stray commits from master back to master-next.