Merge pull request #554 from danmcp/master

Merged by openshift-bot