Merge branch '52-compilation-error-when-using-mpi2' into 'branch_4.2'

Resolve "Compilation error when using mpi2"

Closes #52 (closed)

See merge request !89 (merged)

(cherry picked from commit 2696032b)

3bb4a90a Adding key_mpi2 where needed to avoid compilation errors when using MPI2