Merge branch 'master' into 'log-format'

# Conflicts:
#   config/default.js
4 jobs for log-format in 9 minutes and 34 seconds (queued for 2 minutes and 4 seconds)
Status Name Job ID Coverage
  Build
passed build #34907

00:04:20

 
  Test
passed lint #34910

00:00:21

passed test:chrome #34908

00:03:41

passed test:firefox #34909

00:01:29