Integrate #1258 into the persistent-2.13 branch#1261

parsonsmatt merged 2 commits intoyesodweb:persistent-2.13yesodweb/persistent:persistent-2.13from

danbroooks:persistent-2.13-mergedanbroooks/persistent:persistent-2.13-mergeCopy head branch name to clipboard