Merge branch 'develop'
Merge branch 'master' of ssh://localhost:2000/NA62/na62-trigger-algorithms