Fix for Bug 894229
Merge pull request #1191 from jtharris/bugs/894229

Merged by openshift-bot