reverted to 2.0-unstable7 for media & file_entity