remove some more mysqlisms
Merge remote-tracking branch 'upstream/master'
fix broken unittest (rename url)
fix old emails cleanup