Merge pull request #2500 from danmcp/master

Merged by openshift-bot