Update to match SVN checkin