Merge branch 'master' into multi-loom

Conflicts:
	loom/test/test_query_math.py