Bug 1051446
Merge pull request #4457 from danmcp/master

Merged by openshift-bot