Merge pull request #2124 from alarcher/openmpi1103