07: Use password_* functions for encrypting passwords
Merge branch 'master' into gh-pages