Merge branch 'media-fixes' (patches from Mauro)