Bug 915246 crashes by adu

@selenamarie r?

Also, it appears that the citext doesn't exist in the migration. Suggestions on fixing that would be appreciated.

I will rebase and merge.