Merge tag 'gpodder-3.1.0' into harmattan