more bins; also calculating average via simpler method for correctness check
Authored by: vsp_nagel 2013-12-09
Parent: [r27099]
Child: [r27101]
