Fix omp

Merged Andreas Marek requested to merge fix_omp into master_pre_stage

Merge request reports