Fix for bug WWW-1437