Merge pull request #2799 from alarcher/openmpi1106