Merge pull request #4971 from danmcp/master

Merged by openshift-bot