This was SVN commit r7497.
Update some files I forgot in previous commits. This was SVN commit r7361.