Improved MPI (SGI MPT, OpenMPI, IntelMPI) detection
Merge remote-tracking branch 'origin/develop' into develop