Fix bug 997593
Merge pull request #3379 from pmorie/bugs/997593

Merged by openshift-bot