Merge branch 'master' of https://github.com/rsyslog/rsyslog-pkg-ubuntu