avoid div/zero error
Merge branch 'master' into feature/575_freq_part2
Merge branch 'master' into feature/575_freq_part2
Merge branch 'master' into feature/575_freq_part2
Merge pull request #890 from debrief/feature/575_freq_part2

Minor fix, pull it in.