Merge branch 'master' into master

pending
(Bruce Becker) #1

Merge branch ‘master’ into master


GitHub sha: 19b27bce