More use of maybe-require-package
Merge remote-tracking branch 'upstream_purcell/master'