Bug 1044927
Merge pull request #4583 from danmcp/master

Merged by openshift-bot