Merge branch alfroch-fix-PlottingFunctions with refs/heads/master into...

Merge branch alfroch-fix-PlottingFunctions with refs/heads/master into refs/merge-requests/532/train
50 jobs for !532 with alfroch-fix-PlottingFunctions into master in 15 minutes and 52 seconds (queued for 2 seconds)
merge train