0471e51
3.1-rc6 This is another hand-rolled patch from a fully updated git tree as of today. The top level upstream commit is b6fd41e29dea9c6753b1843a77e50433e6123bcb