Bump version number
Update autogenerated files
Merge branch '3.4branch'

Conflicts:
	Makefile.in