Merge pull request #2859 from danmcp/master

Merged by openshift-bot