Fix bug 949425 949426 952096
Merge pull request #2096 from pmorie/bugs/949425

Merged by openshift-bot