Update via 'svn up' r25567