Merge branch 'add-syslog-module' into develop