Filtering password and credentials from the log.
Merge branch 'master' into staging