Bug 958892
Bug 958892
Merge pull request #2367 from bdecoste/master

Merged by openshift-bot