Merge branch 'master' into 'fixup'

# Conflicts:
#   site_quota/manifests/init.pp
#   site_quota/manifests/user.pp
2 jobs for fixup in 4 minutes and 46 seconds (queued for 3 seconds)
Status Job ID Name Coverage
  Test
passed #1714
lint

00:00:27

passed #1715
parser

00:04:45