Authored by Justin R. Miller

fix mis-merge of GRMustache

Subproject commit 6e51540caec39fbaa0091ae781daa1876a2a515a
Subproject commit e27f2c5b34ae3b65eb75759958a54d75841a7765
... ...