Merge branch v3.0.0-alpha-1 into master.

Conflicts:
	configure.ac