Merge branch 'master' into gh-pages
many changes (not that necessary)
merge