Merge pull request #4860 from danmcp/master

Merged by openshift-bot