Fixed /alias add, when alias already exists
Merge branch 'master' into gmail