Fixed bz1111562

https://bugzilla.redhat.com/show_bug.cgi?id=1111562
Merge pull request #5884 from jwhonce/bug/1111562

Merged by openshift-bot