Will be part of a forthcoming pull request.