Update for JMP change
Merge branch 'master' into gh-pages
Autobuild for 7cc937485b49b4885a8cbb07b21591c7d975e65b