Backport 50c2f40712bab91e4bad1b2aa14c8e9ac1d2dc0a (issue #52) for the v7-stable branch.
Merge branch 'backport_issue_52' of https://github.com/Whissi/rsyslog into v7-stable

Conflicts:
	configure.ac
Merge branch 'v7-stable' into v8-stable

Conflicts:
	configure.ac
Merge branch 'v8-stable'