Bug 974479
Merge pull request #2864 from bdecoste/master

Merged by openshift-bot