svn commit 1365
revision 1371
merge from svn