Bug 1055371
Merge pull request #4567 from danmcp/master

Merged by openshift-bot