Merge pull request #4800 from danmcp/master

Merged by openshift-bot