Undo Skyzyx's breakages, add a fix slightly less hacky than we had with RC2
Undo Skyzyx's breakages, add a fix slightly less hacky than we had with RC2

Alkarex/simplepie,barryvdh/simplepie,skyzyx/simplepie,ropik/simplepie,wikidi/simplepie,blat/simplepie,barryvdh/simplepie,simplepie/simplepie,songfj/simplepie,blat/simplepie,wikidi/simplepie,ropik/simplepie,blat/simplepie,Alkarex/simplepie,FreshRSS/simplepie,Alexia/SimplePie,barryvdh/simplepie,FreshRSS/simplepie,Alkarex/simplepie,songfj/simplepie,mblaney/simplepie,songfj/simplepie,gsnedders/complexpie,skyzyx/simplepie,wikidi/simplepie,Alexia/SimplePie,simplepie/simplepie,mblaney/simplepie