Merge pull request #4123 from danmcp/master

Merged by openshift-bot