Copy from SVN trunk

SVN trunk at revision 1053.