Bug 995460
Merge pull request #3850 from danmcp/master

Merged by openshift-bot