Merge branch '0.4.x'
Merge branch '0.4.x'
Fixes #35 for log rotation.
Changelog
Merge branch 'master' into 0.4.x