merge r349 from branches/jython
1 file changed