masked password in verbose log
Merge remote-tracking branch 'origin/forpull2'

Conflicts:
	bin/db-migrate