merge 93f0668f0fd9f9596b569f5c19b37c5ddc3a3849, refs #1086