Bug 960378
Merge pull request #2386 from bdecoste/master

Merged by openshift-bot