Merge branch 'master' into 'dev'

# Conflicts:
#   reposync.nomad.tpl
6 jobs for dev in 19 seconds (queued for 2 seconds)