Merge branch 'develop' into 'add_noquota'

# Conflicts:
#   server/lib/classes/cron.d/100-monitor_hd_quota.inc.php
2 jobs for !1704 with add_noquota
merge request