Merge branch 'master' into gh-pages
select today
Merge branch 'gh-pages'