Merge remote-tracking branch 'upstream/master' into topic/add_unicode_methods

Conflicts:
	opentreemap/treemap/tests.py