Bug 1035186
Merge pull request #4477 from danmcp/master

Merged by openshift-bot