SIGN IN SIGN UP

merge with 3.2

G
Georg Brandl committed
2cf04487acda2dcdc3837fab5498c66921c514bd