2.0 trunk

git-svn-id: https://plugins.svn.wordpress.org/enhanced-media-library/trunk@1026246 b8457f37-d9ea-0310-8a92-e5e31aec5664