Bumped to trunk revision 35473