Bug 952513
Merge pull request #2163 from bdecoste/master

Merged by openshift-bot