Merge remote-tracking branch 'origin/branch-6-4'

Conflicts:
	mapgml.c
Revert "Change  GML multiline WFS response to be compatible with Simple features profile"

This reverts commit 39ac1e679e6d6da3ae2374ac372d0c6a9c2b1f44.