Thanks for working on this. Pushed to 2.0.x.