Foled in 3.11.0 changes...

Conflicts:
	Makefile.am
	api.c
push cast of long