This fixes conflict resolution error introduced in commit: 816d115317c522c87297109de781c63b16146493 http://bugzilla.gnome.org/show_bug.cgi?id=790042
This fixes conflict resolution error introduced in commit: 816d115317c522c87297109de781c63b16146493 http://bugzilla.gnome.org/show_bug.cgi?id=790042