Fix handling of email addresses with quoted domain part (#1490040)
Fix comm_path update on task switch (#1490041)
Fix PERMANENTFLAGS checking in modFlag()
Add config option to specify IMAP connection socket parameters - imap_conn_options (#1489948)

Conflicts:
	CHANGELOG
Fix merging folder annotations for folders with numeric names (only digits)
Fix error in MSSQL update script 2013061000.sql (#1490061)
raoulbhatia: Custom changes