Merge branch 'updates'
Revert c446532..5b2e416

This rolls back to commit c44653297a6694c3bbb2d07ed75347386e2199e9.
apply Exposed form in media browser view plugin - apply goes to wrong url.

https://www.drupal.org/node/1975836
apply patch to fix deleting images

https://www.drupal.org/node/1968442
Merge branch 'master' into updates