Nice pull request, thank you. I've merged it in master, let us know if you need it backported in another maintained branch.