Hopefully a fix for both FS#38860 and FS#38597

Will test more before pushing



git-svn-id: file:///srv/repos/svn-community/svn@105904 9fca08f4-af9d-4005-b8df-a31f2cc04f65