Bug 982921
Merge pull request #4536 from danmcp/bug982921

Merged by openshift-bot