Makefile and docs: require automake 1.12 or later
Merge branch 'stable'

Conflicts:
	Makefile