#2 seems and works good.
@lesleyfernandes yes, I am using #10, that worked for me.
#6 worked for me.
patch works for me (I used #11 against 7.x-1.4 stable version)