Change template delimiter to tilde
Merged the problematic line ending change that I thought might help, but didn't
Backed out changeset: 4f2abf16b903