Merge branch 'master' into gh-pages
update icons
Merge branch 'gh-pages'