Merged SVN r497 and r498.