Use entrypoints package
Merge remote-tracking branch 'origin/master' into docs
Typos; reflect package changes