Bug 1061098
Merge pull request #4678 from danmcp/master

Merged by openshift-bot