Merge remote-tracking branch 'origin/master' into kml
Merge branch 'kml' into nm