am 18aa041a: am 6cd19e02: Merge "Fix some divide by zero errors that could crash the system." into jb-dev

* commit '18aa041a62d36b9f2d4ead8ca0945ec87af582b4':
  Fix some divide by zero errors that could crash the system.