Fix mutually recursive require()s
Merge branch 'regex-queries'

Conflicts:
	lib/computed/filter.js