Merge branch 'master' into WindowsSupport

Conflicts:
	dax/Extent.h
	dax/Types.h
	dax/exec/internal/TopologyUniform.h
	dax/internal/Configure.h.in