Merge branch '7.x-3.x' of git.drupal.org:project/media into 7.x-3.x