Merge pull request #546 from danmcp/master

Merged by openshift-bot