I pushed this change in 82a8d74c4d7ceeaec0ba4b0c6844561d322dc031, you need to rebase onto the upstream master branch.