Re-instate Free/Paid tabs (bug 945659)
Merge pull request #1482 from muffinresearch/reinstate-free-paid-tabs-945659

Re-instate Free/Paid tabs (bug 945659)