Merge branch 'stable'

diff --cc imap/command.c
Simple merge

diff --cc imap/imap.c
Simple merge

diff --cc imap/imap_private.h
Simple merge

diff --cc imap/util.c
Simple merge