Bug 1025204
Merge pull request #4062 from danmcp/master

Merged by openshift-bot