Only log redirection when one actually occurs
Strip out username/password from logging
Fix typo on stripping out log info
Merge remote-tracking branch 'upstream/master' into hedwig34