Forward patch of SVN revision 2752