Remove marker-color field
Merge branch 'master' into gh-pages