Fix bug 962934
Merge pull request #2465 from pmorie/bugs/962934

Merged by openshift-bot