Drupal 7 meta 3 #135 from 1 16

applies successfully with patch -p1 not git apply