Also, added patch against 2.x incase someone needs it.