Merge branch alfroch-combine-flavour-pdf with refs/heads/master into refs/merge-requests/442/train

43 jobs for !442 with alfroch-combine-flavour-pdf into master in 11 minutes and 26 seconds (queued for 4 seconds)
merge train