Merge branch 'master' into r+tree

Conflicts:
	code/RtreeApi.py