Added support for formula-based totals
Merge remote-tracking branch 'origin/master'