Merge pull request open-mpi#1209 from rhc54/cmr110/abort

While we weren't really hanging, it was taking a very, very long time…

Author: rhc54