Lots of addons were broken by 2.1 and most authors have now issued 2.1 only compatibility fixes so do be careful. Best way I found is to disable everything, upgrade, then update and enable each addon independently. It's tedious stuff.
The 2.1 branching was unfortunate and rather more painful than it should've been. Keep a fresh backup at the ready.