Merge ssh://git.codethink.co.uk/git/atspi-dbus into mgorse