Merge pull request #548 from danmcp/master

Merged by openshift-bot