Merge changes I28b846a3,Ifd9b48cb

* changes:
  MediaScanner: Fix problems with scanner non-file objects from the database
  MTP: Delete all files and subdirectories when deleting directories.
tree: 1e7afed8ff0231c6b168062fa8f04396d6eb7f2f
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE