Bug 1057734 - Protect against divide by zero
Merge pull request #4635 from jwhonce/bug/1057734

Merged by openshift-bot