Merge pull request #3421 from miska/rsyslog