Fix incorrect merging of trees with empty literal at end

Conflicts:

	src/ptree.c
	src/samp.c
bump version number