Merge branch 'master' into fortran_with_timers to add the rand bugfix into this branch to be used today