Merge 24347d30b8074ac231228641a305274669bf9ddc into master.

Conflicts:
	lib/apricot/special_forms/recur.rb