Bug 952051
Merge pull request #2170 from bdecoste/master

Merged by openshift-bot