Merge pull request #4105 from danmcp/master

Merged by openshift-bot