Got rid of annoying warning message when starting without log directory specified
Merge branch 'master' into ubuntu