Merge remote-tracking branch 'working/user/dbwells/lp1422379_move_billing_timestamps_... collab/berick/2015-06-09-bug-squashing-combined
authorBill Erickson <berickxx@gmail.com>
Tue, 9 Jun 2015 15:05:22 +0000 (08:05 -0700)
committerBill Erickson <berickxx@gmail.com>
Tue, 9 Jun 2015 15:05:22 +0000 (08:05 -0700)

Trivial merge