Fix bug 964348
Merge pull request #2554 from pmorie/bugs/964348

Merged by openshift-bot