Bug 956050
Bug 956050
Merge pull request #2266 from bdecoste/master

Merged by openshift-bot