My attempt to Fix build on CURRENT broke it on STABLE :-(
State Changed From-To: open->closed committed, thanks