Fix bug 968343
Merge pull request #2672 from pmorie/bugs/968343

Merged by openshift-bot