merge codehaus 3.13.2