First step in database overhaul: Changing how subscriptions are handled.
Last commit before finalizing 1.4.
Last 1.4 commit before merging into master.