Simplified done.cg #819
Version bump
Merge branch 'master' into yesod-1.4