Merge branch 'master' into gh-pages
Param checks
Merge branch 'gh-pages'