fix changelog -- we should have all changes in trunk that are in 2.6.4
fix changelog -- we should have all changes in trunk that are in 2.6.4

vodik/pytest,The-Compiler/pytest,rouge8/pytest,bubenkoff/pytest,jb098/pytest,RonnyPfannschmidt/pytest,Bachmann1234/pytest,pelme/pytest,MengJueM/pytest,davidszotten/pytest,mdboom/pytest,Carreau/pytest,vodik/pytest,Carreau/pytest,tgoodlet/pytest,untitaker/pytest,omarkohl/pytest,Bjwebb/pytest,wfxiang08/pytest,userzimmermann/pytest,tomviner/pytest,oleg-alexandrov/pytest,codewarrior0/pytest,markshao/pytest,ghostsquad/pytest,hunse/pytest,lukas-bednar/pytest,JonathonSonesen/pytest,ropez/pytest,icemac/pytest,nicoddemus/pytest,mhils/pytest,MichaelAquilina/pytest,gabrielcnr/pytest,ojake/pytest,pelme/pytest,userzimmermann/pytest,hunse/pytest,chillbear/pytest,omarkohl/pytest,codewarrior0/pytest,icemac/pytest,JonathonSonesen/pytest,ericdill/pytest,Haibo-Wang-ORG/pytest,rouge8/pytest,ionelmc/pytest,mbirtwell/pytest,jaraco/pytest,takluyver/pytest,ropez/pytest,Bachmann1234/pytest,Bjwebb/pytest,jb098/pytest,gabrielcnr/pytest,wfxiang08/pytest,nicoddemus/repo-test,chiller/pytest,skylarjhdownes/pytest,ionelmc/pytest,mdboom/pytest,pytest-dev/pytest,untitaker/pytest,abusalimov/pytest,etataurov/pytest,Akasurde/pytest,hackebrot/pytest,bubenkoff/pytest,hpk42/pytest,inirudebwoy/pytest,doordash/pytest,bukzor/pytest,flub/pytest,chillbear/pytest,rmfitzpatrick/pytest,ddboline/pytest,abusalimov/pytest,Haibo-Wang-ORG/pytest,doordash/pytest,txomon/pytest,inirudebwoy/pytest,tomviner/pytest,hpk42/pytest,chiller/pytest,mhils/pytest,mbirtwell/pytest,tareqalayan/pytest,The-Compiler/pytest,ojake/pytest,ericdill/pytest,pfctdayelise/pytest,alfredodeza/pytest,takluyver/pytest,lukas-bednar/pytest,bukzor/pytest,nicoddemus/repo-test,oleg-alexandrov/pytest,eli-b/pytest,MengJueM/pytest,ghostsquad/pytest,malinoff/pytest,vmalloc/dessert,nicoddemus/pytest