Merge branch 'master' into verbose-rewrite

diff --cc fdroidserver/checkupdates.py
Simple merge

diff --cc fdroidserver/common.py
Simple merge

diff --cc fdroidserver/stats.py
Simple merge

diff --cc fdroidserver/update.py
Simple merge