TRUNK-287

I think this one is correct :) Finally.