Merge remote-tracking branch 'origin/master'

Conflicts:
	AdhocEva/AdhocMeasure.pyc
	cxBase/Vector.py
	cxBase/base.pyc