Bug 956572
Merge pull request #2395 from bdecoste/master

Merged by openshift-bot