svn merge -r 58117:58118...

svn merge -r 58117:58118 svn+ssh://svn.lindenlab.com/svn/linden/branches/release-candidate (into release)

Port of fix for SL-35327 which was fixed in release-candidate.