Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'gh-pages'
matching orange add, remove, and check mark