Bug 998337
Merge pull request #4526 from danmcp/bug998337

Merged by openshift-bot