backported 5f514cb715780be03a24d4cae0ab12d8fc8246d5 to 1.0 - refs #414