Updates

Merged username-removed-25246 requested to merge krt/fdroiddata:updates into master May 29, 2014