More use of maybe-require-package
Merge remote-tracking branch 'refs/remotes/upstream/master'