Bug 1056349
Merge pull request #4552 from danmcp/master

Merged by openshift-bot