Merge branch 'maint'

Was cooking for a week and seems to be regression-free.

	aft: Generate a remove event when adding duplicate files.
	command.c: Add missing items to EMPTY_STATUS_ITEMS.
	aft.c: Don't call osl_close_disk_object() on failure.
	Add missing osl() wrapper calls.
	fd.c: Add missing va_end().

The conflict in aft.c was trivial to fix up.