Merge branch 'master' into 16-flo-vs-hdf5

1 job for 16-flo-vs-hdf5 in 1 minute and 24 seconds