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)
Name Stage Failure
failed
test_mpi Test There is an unknown failure, please try again
No job log
failed
test_mpi_fftw Test There is an unknown failure, please try again
No job log
failed
test_min Test There is an unknown failure, please try again
No job log
failed
test_mpi_fftw_hdf5 Test There is an unknown failure, please try again
No job log