merge 0528e2cce436563f21a3dc0e0bab72f815fe2d4a, refs #987