Add support for expressions in labels to XML mapfile XSD and XSL
Add support for multiple LABEL per CLASS
fix segfault on UVRASTER layers with mask set (#4779)
avoid segfault on erroneous mask references (#4779)
Fix bug with empty geometrycollections (#4751)
Merge branch 'branch-6-4'
update for rfc104
update submodule
fix segfault on label with failed scale check (#4781)
Fix ISO C90'ism that causes MSVC compilation error
Fix ISO C90'ism that causes MSVC compilation error
fix rendering of legendicons with 0-length name (#4782)
Merge branch 'b4782-legend-notext'
avoid erroneous hittest results for clipped shapes
Fix memory corruption on empty raster query (#4778)
Merge branch 'branch-6-2' into branch-6-4

Conflicts:
	maprasterquery.c
	msautotest
Merge branch 'branch-6-4'

Conflicts:
	msautotest
update submodule
Fix crash on legend icon with offset generation (#4790)
Merge pull request #4769 from markathomas/master

Add support for expressions in labels to XML mapfile XSD and XSL