merge revision 872:873 from trunk :