sync with svn #11