Merge remote-tracking branch 'origin/db_tree_view_patch' into db_tree…

…_view_patch

# Conflicts:
#	activity_browser/ui/tables/models/inventory.py