Log: fix #184
Merge branch 'develop' into develop#181