Merge branch '2.3' into 2.7

* 2.3:
  Fixing build error
  Tweaks thanks to everyone!
  [WIP] Reworking most of the registration form:
  Fixing build problems and wrong links

Author: weaverryan