Bug 966535
Merge pull request #3264 from pmorie/bugs/966535

Merged by openshift-bot