Merge branch 'master' into 'beta'

Fix renewal (via the susignup system) print credits not being added

See merge request !82
3 jobs for beta in 3 minutes and 22 seconds (queued for 4 minutes and 57 seconds)