Bring framework up-to-date with upstream master.
Bring framework up-to-date with upstream master.

ppy/osu,peppy/osu,theguii/osu,Frontear/osuKyzer,peppy/osu-new,smoogipoo/osu,ppy/osu,peppy/osu,UselessToucan/osu,Damnae/osu,nyaamara/osu,smoogipoo/osu,2yangk23/osu,johnneijzen/osu,naoey/osu,RedNesto/osu,NeoAdonis/osu,NeoAdonis/osu,ppy/osu,naoey/osu,NeoAdonis/osu,default0/osu,EVAST9919/osu,Drezi126/osu,peppy/osu,smoogipoo/osu,2yangk23/osu,NotKyon/lolisu,DrabWeb/osu,DrabWeb/osu,ZLima12/osu,UselessToucan/osu,tacchinotacchi/osu,DrabWeb/osu,Nabile-Rahmani/osu,osu-RP/osu-RP,johnneijzen/osu,smoogipooo/osu,naoey/osu,ZLima12/osu,UselessToucan/osu,EVAST9919/osu