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

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