Bug 1044223
Merge pull request #4509 from danmcp/master

Merged by openshift-bot