minor clean up.
renamed HAD_MULTIPART_POLY to had multipart polygon
Merge remote-tracking branch 'origin/master'