fix error
Merge remote-tracking branch 'origin/master'

Conflicts:
	data_sets/2/query_def.py