manually merged changes from pull request 209
Merge remote-tracking branch 'github/6.x-3.3-rc1' into jr-6.x-3.3-413-charge-dates-in-the-past