Merge branch 'master' into fticks_syslog2