Be smarter about saving bills when processing calendars.
Merge branch 'master' into prod