Allow loglevel to be stringy or inty
Merge branch 'master' into no_cli