Drupal 7 meta 3 #135 from 1 10

These patches were applied by downloading and patch -p1 with success messages like "Hunk #1 succeeded at 4327 (offset 44 lines)."