Merge branch 'master' into 'remove_LineEnergy'

Master

See merge request !87
4 jobs for remove_LineEnergy in 5 minutes and 51 seconds (queued for 1 minute and 14 seconds)