refs #3053

propagated to 3.1.6