Merge pull request #4683 from danmcp/master

Merged by openshift-bot