Bumped to trunk revision 35629