Make sure logs always exist (fixes GH-4)
Merge remote-tracking branch 'upstream/master'