Merge branch 'support_all_standard_kml_files'