Merge branch 'm34_MDL-60318_Undefined_method_file_storage-move_to_trash' of https...