- Fixed 2 typos in the user module.  Thanks Axel and Remco.
- Applied (modified versions of) Alexander's patches on the development
  branch.