Avoid divide by zero
Merge branch 'develop' into btsx