Merge branch 'master' into 'issue/391'

# Conflicts:
#   package/debian/changelog
2 jobs for issue/391 in 1 minute and 45 seconds (queued for 2 seconds)