Merge New Template Haskell branch.
authorGeoffrey Mainland <gmainlan@microsoft.com>
Fri, 4 Oct 2013 21:52:52 +0000 (17:52 -0400)
committerGeoffrey Mainland <gmainlan@microsoft.com>
Fri, 4 Oct 2013 21:52:52 +0000 (17:52 -0400)

Trivial merge