Merge pull request #4859 from danmcp/master

Merged by openshift-bot