Update to trunk revision 2479