Fix bug 1021016
Merge pull request #3946 from pmorie/bugs/1021016

Merged by openshift-bot