Merge pull request #4743 from danmcp/master

Merged by openshift-bot