Changes from Subversion 1468