Merge pull request #4701 from danmcp/master

Merged by openshift-bot