Upstream org changes
Remove newline after snippet
Abbrev for teh -> the
Upstream org changes