Merge branch 'sctp_logspam'