don't leak database passwords
Merge branch '1.2-bugfix'