Bug 1034110
Merge pull request #4530 from danmcp/bug1034110

Merged by openshift-bot