Updated _generated_media_names
Merge branch 'master' into develop