Name is a property, not a string.
Merge branch 'kml' into uberbranch