Update of patch from Takahiro Kawashima

Refs #3986