Import v7
Import v8
Import v8a
Import v8b
Import v8c
Import v8d
Import v9
Merge tag 'v9'

Conflicts:
	makefile.cfg

Which had been modified locally but is no longer present
in v9 so has been removed.