Updated mapserver.h and HISTORY.TXT for 6-2-1 release.
Added per-label TEXT attribute in xml schema and xsl (closes #4639)
Fix rendering annotation layers with expressions in legend (#4641)
The text param of point->draw in php is now optional, no need of strlen(labeltext) in libmapserver (#4572)
Merge branch 'branch-6-2' of https://github.com/mapserver/mapserver into branch-6-2
harmonize 32/64bit behavior when rounding

- use lrint
- avoid floats
- no implicit casts
Legend icons do not reflect geometry transformations (#4642)
Fix rendering annotation layers with expressions in legend (#4641)
Legend icons do not reflect geometry transformations (#4642)

Conflicts:

	maplegend.c
Clean up the extra class added when rendering pie charts (#4645)
Clean up the extra class added when rendering pie charts (#4645)
add support for reentrant giflib>=5.0 (#4646)

closes #4646
Merge branch 'branch-6-2'

Conflicts:
	maplegend.c
	mapserver.h
don't round geo-to-pixel transforms for points (#4643)
travis build update
swig
-php
+php5-dev
temp commit, test travis-ci builds