Note that this work is merged into Jython trunk