device: merge branch 'th/device-applied-connection-bgo760884'
authorThomas Haller <thaller@redhat.com>
Tue, 16 Feb 2016 10:28:37 +0000 (11:28 +0100)
committerThomas Haller <thaller@redhat.com>
Tue, 16 Feb 2016 10:28:37 +0000 (11:28 +0100)
https://bugzilla.gnome.org/show_bug.cgi?id=760884
https://bugzilla.gnome.org/show_bug.cgi?id=761714


Trivial merge