Merge branch 'wip/oholy/trashing-locations2' into 'master'

Resubmit of reverted trash related changes and tests

See merge request !83
8 jobs for master in 22 minutes and 8 seconds (queued for 6 seconds)
Status Job ID Name Coverage
  Build
passed #44407
fedora-meson-android_ndk_r16_api21_arm64

00:05:15

passed #44408
fedora-meson-mingw64

00:15:05

passed #44406
fedora-meson-x86_64

00:15:58

passed #44409
win32
msys2-mingw32

00:06:26

passed #44410
win32
vs2017-x64

00:05:39

 
  Coverage
passed #44411
coverage

00:05:18

76.9%
 
  Deploy
passed #44412
pages

00:00:51

passed pages:deploy

00:00:03