Merge branch '181_opmgrid' into rolk
Merge branch '182_openmp' into rolk