fdd819e9f6
(prep work for presence tracking) https://bugzilla.gnome.org/show_bug.cgi?id=611613
(prep work for presence tracking) https://bugzilla.gnome.org/show_bug.cgi?id=611613