Merge pull request #4587 from danmcp/master

Merged by openshift-bot