Merge branch 'master' into intrinsic-vectorisation
Conflicts: src/hydro/Default/hydro_iact.h src/hydro/Gadget2/hydro.h src/hydro/Gadget2/hydro_debug.h src/hydro/Gadget2/hydro_iact.h src/hydro/Gadget2/hydro_part.h tests/testInteractions.c tests/testSymInt.c
This diff is collapsed.