anti confusion: log and loglevel are now the same
Merge branch 'next'
minor: tab to space