am 93e122e2: Merge "Fix potential "divided by zero" exception" into jb-dev

* commit '93e122e28d1a51d669104a7ac36ff8a8727d3252':
  Fix potential "divided by zero" exception