Merged SVN r499.