Merge branch 'master' into 'dev'

Implement NNLO scaling in the HH model

See merge request !14
2 jobs for dev