Merge branch 'aw/spamassassin'