Issue #535616 by jhodgdon, rootwork, ianthomas_uk, pwolanin, oriol_e9g | tgeller: Make Content Ranking settings for Search not say "weights" to avoid confusion.
Issue #2157017 by sun, rfay: DrupalHTTPRequestTestCase breaks on php-fpm [testbot PHP 5.4 blocker].
Merge branch '1.x' of github.com:backdrop/backdrop into 1.x