Merge pull request #4780 from danmcp/master

Merged by openshift-bot