Bug 1044840
Merge pull request #4387 from danmcp/master

Merged by openshift-bot