Fixes from merging master
Fixes from merging master

GNOME/telepathy-account-widgets,GNOME/telepathy-account-widgets,GNOME/telepathy-account-widgets,Distrotech/telepathy-account-widgets,Distrotech/telepathy-account-widgets