Merge trunk into branch "sctp"