Version 2.7.1
Merge branch 'maint'

Conflicts:
	src/version.h