Merged from upstream.
Also add pytz to test requirements.
Merge branch 'master' into multiple-subscriptions
Implement backwards data migration to recover CurrentSubscription table
from Subscription table.