Merge branch 'data_races' into 'master'

fix openmp data races

See merge request !396 (merged)

(cherry picked from commit 8459c9a9)

974d0a33 fix some (harmless) openmp data races e8e3ce32 fix warning