Merge branch 'master' into feat/omp-speedups
Merge branch 'feat/omp-speedups' into develop