Update to revision 2526 (2.1 branch)