Don't log password (fix #90).
Merge branch 'master' into develop