Bug 1038559
Merge pull request #4528 from danmcp/bug1038559

Merged by openshift-bot