merging master back into branch

Conflicts:
	integration_tests/test_query.py