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