Bring over master:

open-mpi/ompi@8ded59ce
Merge pull request #68 from rhc54/cmr/alps-fix

Update ALPS plm module