Various backports from master to libgdata-0-18, none of which had any conflicts.
master
libgdata-0-18