Merge pull request #2861 from danmcp/master

Merged by openshift-bot