Merge pull request #2467 from danmcp/master

Merged by openshift-bot