Add support for KML folders.
Merge branch 'kml' into uberbranch
Uncomment list.