Merge branch 'master' into 'beta'

Correctly extract old user page count from DB

See merge request !105
3 jobs for beta in 3 minutes and 5 seconds (queued for 5 seconds)