Merge branch 'master' into 'AllCapping'

# Conflicts:
#   smradius/modules/features/mod_feature_capping.pm
1 job for AllCapping in 59 seconds (queued for 314 minutes and 5 seconds)
latest