Merge remote-tracking branch 'remotes/tonsky/master' into analyze-q

Conflicts:
	project.clj
	src/datascript.cljs