Try to figure out Mac failure.  Refs #6650.
Merge branch 'feature/6650_powder_redux' into develop