Merge mapserver/master to mapserver-merge/master.