H. J. It was r120218 that did it; or rather, it was the part that fixed PR20896. I have successfully built tonto-2.3.1, with PR20896 'unfixed'. If I do not see a quick work around, I will simply commit this reverted version later this afternoon. Many thanks for the report Paul