Merge branch 'msg_expire' into integration

Conflicts:
	src/mod_offline.erl