Resolve merge conflicts for #3128
Resolve merge conflicts for #3128

matham/kivy,rnixx/kivy,manthansharma/kivy,rnixx/kivy,kived/kivy,kivy/kivy,autosportlabs/kivy,Cheaterman/kivy,manthansharma/kivy,jkankiewicz/kivy,manthansharma/kivy,janssen/kivy,Cheaterman/kivy,akshayaurora/kivy,akshayaurora/kivy,LogicalDash/kivy,tony/kivy,KeyWeeUsr/kivy,jegger/kivy,jegger/kivy,jegger/kivy,LogicalDash/kivy,KeyWeeUsr/kivy,rnixx/kivy,bionoid/kivy,inclement/kivy,janssen/kivy,rafalo1333/kivy,inclement/kivy,autosportlabs/kivy,inclement/kivy,janssen/kivy,rafalo1333/kivy,jegger/kivy,LogicalDash/kivy,KeyWeeUsr/kivy,autosportlabs/kivy,kivy/kivy,tony/kivy,akshayaurora/kivy,LogicalDash/kivy,matham/kivy,bionoid/kivy,tony/kivy,KeyWeeUsr/kivy,rafalo1333/kivy,Cheaterman/kivy,jkankiewicz/kivy,matham/kivy,jkankiewicz/kivy,bionoid/kivy,jkankiewicz/kivy,matham/kivy,kived/kivy,manthansharma/kivy,kived/kivy,bionoid/kivy,kivy/kivy,Cheaterman/kivy,janssen/kivy