correction for XCL 2.2 HTML editor control
Merge branch 'gmap_v3' into exif_supprt