Merge pull request #4791 from danmcp/master

Merged by openshift-bot