Merge remote-tracking branch 'origin/master'
Add an index to the user email field to speed up searches (#570)