Merge pull request #209 from quicksketch/biolithic-drupal_7_meta_4_#222_from_5_8

Issue #222: Drupal 7 cross-ports meta 4.
Merge remote-tracking branch 'origin/1.x' into 1.x
Merge branch '1.x' of github.com:backdrop/backdrop into 1.x
Merge branch '1.x' of github.com:backdrop/backdrop into 1.x
Issue #195: Merge search-results.tpl.php and search-result.tpl.php.
Merge pull request #239 from hellomrcat/195-search

Issue #195: Merge search-results.tpl.php and search-result.tpl.php.