Mole
8258178c5a
Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/migrate-logging
# Conflicts:
# src/Umbraco.Infrastructure/Media/UploadAutoFillProperties.cs
# src/Umbraco.Infrastructure/PropertyEditors/FileUploadPropertyEditor.cs
# src/Umbraco.Infrastructure/PropertyEditors/ImageCropperPropertyEditor.cs
# src/Umbraco.Tests/Models/MediaXmlTest.cs
# src/Umbraco.Tests/Routing/MediaUrlProviderTests.cs
# src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs
# src/Umbraco.Web.BackOffice/Controllers/MediaController.cs