Pull in latest changes from gnome3 / marcuscom repo