Merged trunk to branch elmo-imap4-compliance