Issue #2051519 by GoddamnNoise: Fix errors in registry.inc docs
Issue #2157017 by sun, rfay: DrupalHTTPRequestTestCase breaks on php-fpm [testbot PHP 5.4 blocker].
Issue #2037847 by droplet: Join position strings together to fix translatability in the administrative interface for the Image module "Crop" effect.
Fix typo in CHANGELOG.txt.
Issue #535616 by jhodgdon, rootwork, ianthomas_uk, pwolanin, oriol_e9g | tgeller: Make Content Ranking settings for Search not say "weights" to avoid confusion.
Merge branch '7.x' into 7.x-pimple