Merge branch 'date-extension' into imap4flags-2.5-working

Conflicts:
	sieve/bc_eval.c
	sieve/bc_generate.c
	sieve/bytecode.h
	sieve/sieved.c
Merge remote-tracking branch 'origin/master' into imap4flags-2.5-working