Allow use of pepper versions 39, 40, && canary.
Merge branch 'master' into try-merge