Add following commits from master:

open-mpi/ompi@9529289
open-mpi/ompi@206eade