Merge remote branch 'overlays-gentoo-org/master' into prefix

diff --cc bin/filter-bash-environment.py
Simple merge

diff --cc man/emerge.1
Simple merge

diff --cc pym/_emerge/depgraph.py
Simple merge

diff --cc pym/_emerge/main.py
Simple merge

diff --cc pym/portage/dbapi/vartree.py
Simple merge