Applied svn r33 patch