Bring up to date with SVN r1027 2013-08-16.