Merge trunk to elmo-imap4-compliance