merge with trunk

git-svn-id: file:///var/www/svn/anahita/subscriptions/branches/search@17237 a933e228-e664-4d3f-8241-49479697c698