Merge "Fixes potential divide by zero crash." into tm-qpr-dev