Division by zero bugfix
Merge branch 'master' into exnom