Merged correctly. refs #437
Merged again. refs #437