Merge branch 'master' of https://github.com/kuzyk/media-mime-types

git-svn-id: https://plugins.svn.wordpress.org/media-mime-types/trunk@835428 b8457f37-d9ea-0310-8a92-e5e31aec5664