Catch up
Merge remote-tracking branch 'origin/i0006'
Merge remote-tracking branch 'origin/master'

Conflicts:
	yesod-pnotify.cabal