Catch up latest yesod-platform
Merge remote-tracking branch 'origin/i0126'