diff --git a/misc/gramps/Makefile b/misc/gramps/Makefile
index abc5646344e..06500587f9b 100644
--- a/misc/gramps/Makefile
+++ b/misc/gramps/Makefile
@@ -1,16 +1,15 @@
-# $OpenBSD: Makefile,v 1.51 2019/07/12 20:47:50 sthen Exp $
+# $OpenBSD: Makefile,v 1.52 2019/12/13 06:50:55 bentley Exp $
 
 COMMENT=		Genealogical Research Analysis Management Programming System
 
-MODPY_EGG_VERSION=	4.2.8
+MODPY_EGG_VERSION =	5.1.1
 DISTNAME=		gramps-${MODPY_EGG_VERSION}
-REVISION=		3
 
 CATEGORIES=		misc x11
 
 HOMEPAGE=		https://gramps-project.org/
 
-# GPLv2
+# GPLv2+
 PERMIT_PACKAGE=	Yes
 
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gramps/}
diff --git a/misc/gramps/distinfo b/misc/gramps/distinfo
index 2ef157e14f6..bec4669e27e 100644
--- a/misc/gramps/distinfo
+++ b/misc/gramps/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gramps-4.2.8.tar.gz) = qiwYzes9f8B/ABPVypxlHzvUqgLwMBCWaFf4BLInZo0=
-SIZE (gramps-4.2.8.tar.gz) = 18704769
+SHA256 (gramps-5.1.1.tar.gz) = diPB6XahnhIfb6eZymGd7xhnIAC6f9UFq9qp54KSDto=
+SIZE (gramps-5.1.1.tar.gz) = 17281131
diff --git a/misc/gramps/pkg/PLIST b/misc/gramps/pkg/PLIST
index 610a7823af4..8682cf84a97 100644
--- a/misc/gramps/pkg/PLIST
+++ b/misc/gramps/pkg/PLIST
@@ -1,15 +1,15 @@
-@comment $OpenBSD: PLIST,v 1.28 2018/07/01 18:33:36 espie Exp $
+@comment $OpenBSD: PLIST,v 1.29 2019/12/13 06:50:55 bentley Exp $
 bin/gramps
 lib/python${MODPY_VERSION}/site-packages/gramps/
 lib/python${MODPY_VERSION}/site-packages/gramps-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
 lib/python${MODPY_VERSION}/site-packages/gramps/__init__.py
-lib/python${MODPY_VERSION}/site-packages/gramps/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gramps/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/gramps/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/${MODPY_PYCACHE}grampsapp.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/cli/
 lib/python${MODPY_VERSION}/site-packages/gramps/cli/__init__.py
-lib/python${MODPY_VERSION}/site-packages/gramps/cli/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gramps/cli/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/gramps/cli/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/cli/${MODPY_PYCACHE}arghandler.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/cli/${MODPY_PYCACHE}argparser.${MODPY_PYC_MAGIC_TAG}pyc
@@ -22,12 +22,12 @@ lib/python${MODPY_VERSION}/site-packages/gramps/cli/clidbman.py
 lib/python${MODPY_VERSION}/site-packages/gramps/cli/grampscli.py
 lib/python${MODPY_VERSION}/site-packages/gramps/cli/plug/
 lib/python${MODPY_VERSION}/site-packages/gramps/cli/plug/__init__.py
-lib/python${MODPY_VERSION}/site-packages/gramps/cli/plug/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gramps/cli/plug/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/gramps/cli/plug/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/cli/user.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/__init__.py
-lib/python${MODPY_VERSION}/site-packages/gramps/gen/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gramps/gen/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/${MODPY_PYCACHE}const.${MODPY_PYC_MAGIC_TAG}pyc
@@ -46,7 +46,7 @@ lib/python${MODPY_VERSION}/site-packages/gramps/gen/const.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/constfunc.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/datehandler/
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/datehandler/__init__.py
-lib/python${MODPY_VERSION}/site-packages/gramps/gen/datehandler/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gramps/gen/datehandler/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/datehandler/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/datehandler/${MODPY_PYCACHE}_date_ar.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/datehandler/${MODPY_PYCACHE}_date_bg.${MODPY_PYC_MAGIC_TAG}pyc
@@ -118,36 +118,30 @@ lib/python${MODPY_VERSION}/site-packages/gramps/gen/datehandler/_dateutils.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/datehandler/_grampslocale.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/db/
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/db/__init__.py
-lib/python${MODPY_VERSION}/site-packages/gramps/gen/db/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gramps/gen/db/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/db/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/gramps/gen/db/${MODPY_PYCACHE}backup.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/db/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/gramps/gen/db/${MODPY_PYCACHE}bsddbtxn.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/gramps/gen/db/${MODPY_PYCACHE}cursor.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gramps/gen/db/${MODPY_PYCACHE}bookmarks.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/db/${MODPY_PYCACHE}dbconst.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/gramps/gen/db/${MODPY_PYCACHE}dictionary.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gramps/gen/db/${MODPY_PYCACHE}dummydb.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/db/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/gramps/gen/db/${MODPY_PYCACHE}read.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gramps/gen/db/${MODPY_PYCACHE}generic.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/db/${MODPY_PYCACHE}txn.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/db/${MODPY_PYCACHE}undoredo.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/gramps/gen/db/${MODPY_PYCACHE}upgrade.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/gramps/gen/db/${MODPY_PYCACHE}write.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/gramps/gen/db/backup.py
+lib/python${MODPY_VERSION}/site-packages/gramps/gen/db/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/db/base.py
-lib/python${MODPY_VERSION}/site-packages/gramps/gen/db/bsddbtxn.py
-lib/python${MODPY_VERSION}/site-packages/gramps/gen/db/cursor.py
+lib/python${MODPY_VERSION}/site-packages/gramps/gen/db/bookmarks.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/db/dbconst.py
-lib/python${MODPY_VERSION}/site-packages/gramps/gen/db/dictionary.py
+lib/python${MODPY_VERSION}/site-packages/gramps/gen/db/dummydb.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/db/exceptions.py
-lib/python${MODPY_VERSION}/site-packages/gramps/gen/db/read.py
+lib/python${MODPY_VERSION}/site-packages/gramps/gen/db/generic.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/db/txn.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/db/undoredo.py
-lib/python${MODPY_VERSION}/site-packages/gramps/gen/db/upgrade.py
-lib/python${MODPY_VERSION}/site-packages/gramps/gen/db/write.py
+lib/python${MODPY_VERSION}/site-packages/gramps/gen/db/utils.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/dbstate.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/display/
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/display/__init__.py
-lib/python${MODPY_VERSION}/site-packages/gramps/gen/display/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gramps/gen/display/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/display/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/display/${MODPY_PYCACHE}name.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/display/${MODPY_PYCACHE}place.${MODPY_PYC_MAGIC_TAG}pyc
@@ -156,7 +150,7 @@ lib/python${MODPY_VERSION}/site-packages/gramps/gen/display/place.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/errors.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/__init__.py
-lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/${MODPY_PYCACHE}_filterlist.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/${MODPY_PYCACHE}_filterparser.${MODPY_PYC_MAGIC_TAG}pyc
@@ -170,7 +164,7 @@ lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/_paramfilter.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/_searchfilter.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/__init__.py
-lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/${MODPY_PYCACHE}_changedsincebase.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/${MODPY_PYCACHE}_everything.${MODPY_PYC_MAGIC_TAG}pyc
@@ -226,7 +220,7 @@ lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/_regexpidbase.
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/_rule.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/citation/
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/citation/__init__.py
-lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/citation/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/citation/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/citation/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/citation/${MODPY_PYCACHE}_allcitations.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/citation/${MODPY_PYCACHE}_changedsince.${MODPY_PYC_MAGIC_TAG}pyc
@@ -270,7 +264,7 @@ lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/citation/_rege
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/citation/_regexpsourceidof.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/event/
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/event/__init__.py
-lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/event/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/event/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/event/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/event/${MODPY_PYCACHE}_allevents.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/event/${MODPY_PYCACHE}_changedsince.${MODPY_PYC_MAGIC_TAG}pyc
@@ -318,7 +312,7 @@ lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/event/_matches
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/event/_regexpidof.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/family/
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/family/__init__.py
-lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/family/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/family/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/family/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/family/${MODPY_PYCACHE}_allfamilies.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/family/${MODPY_PYCACHE}_changedsince.${MODPY_PYC_MAGIC_TAG}pyc
@@ -342,7 +336,9 @@ lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/family/${MODPY
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/family/${MODPY_PYCACHE}_hassourceof.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/family/${MODPY_PYCACHE}_hastag.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/family/${MODPY_PYCACHE}_hastwins.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/family/${MODPY_PYCACHE}_isancestorof.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/family/${MODPY_PYCACHE}_isbookmarked.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/family/${MODPY_PYCACHE}_isdescendantof.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/family/${MODPY_PYCACHE}_matchesfilter.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/family/${MODPY_PYCACHE}_matchessourceconfidence.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/family/${MODPY_PYCACHE}_memberbase.${MODPY_PYC_MAGIC_TAG}pyc
@@ -377,7 +373,9 @@ lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/family/_hassou
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/family/_hassourceof.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/family/_hastag.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/family/_hastwins.py
+lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/family/_isancestorof.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/family/_isbookmarked.py
+lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/family/_isdescendantof.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/family/_matchesfilter.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/family/_matchessourceconfidence.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/family/_memberbase.py
@@ -392,7 +390,7 @@ lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/family/_search
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/family/_searchmothername.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/media/
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/media/__init__.py
-lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/media/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/media/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/media/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/media/${MODPY_PYCACHE}_allmedia.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/media/${MODPY_PYCACHE}_changedsince.${MODPY_PYC_MAGIC_TAG}pyc
@@ -428,7 +426,7 @@ lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/media/_mediapr
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/media/_regexpidof.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/note/
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/note/__init__.py
-lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/note/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/note/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/note/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/note/${MODPY_PYCACHE}_allnotes.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/note/${MODPY_PYCACHE}_changedsince.${MODPY_PYC_MAGIC_TAG}pyc
@@ -456,7 +454,7 @@ lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/note/_notepriv
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/note/_regexpidof.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/person/
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/person/__init__.py
-lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/person/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/person/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/person/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/person/${MODPY_PYCACHE}_changedsince.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/person/${MODPY_PYCACHE}_deeprelationshippathbetween.${MODPY_PYC_MAGIC_TAG}pyc
@@ -486,6 +484,7 @@ lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/person/${MODPY
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/person/${MODPY_PYCACHE}_hasnotematchingsubstringof.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/person/${MODPY_PYCACHE}_hasnoteregexp.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/person/${MODPY_PYCACHE}_hasrelationship.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/person/${MODPY_PYCACHE}_hassoundexname.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/person/${MODPY_PYCACHE}_hassourcecount.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/person/${MODPY_PYCACHE}_hassourceof.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/person/${MODPY_PYCACHE}_hastag.${MODPY_PYC_MAGIC_TAG}pyc
@@ -564,6 +563,7 @@ lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/person/_hasnot
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/person/_hasnotematchingsubstringof.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/person/_hasnoteregexp.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/person/_hasrelationship.py
+lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/person/_hassoundexname.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/person/_hassourcecount.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/person/_hassourceof.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/person/_hastag.py
@@ -616,7 +616,7 @@ lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/person/_relati
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/person/_searchname.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/place/
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/place/__init__.py
-lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/place/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/place/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/place/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/place/${MODPY_PYCACHE}_allplaces.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/place/${MODPY_PYCACHE}_changedsince.${MODPY_PYC_MAGIC_TAG}pyc
@@ -641,6 +641,7 @@ lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/place/${MODPY_
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/place/${MODPY_PYCACHE}_matchessourceconfidence.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/place/${MODPY_PYCACHE}_placeprivate.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/place/${MODPY_PYCACHE}_regexpidof.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/place/${MODPY_PYCACHE}_withinarea.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/place/_allplaces.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/place/_changedsince.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/place/_hascitation.py
@@ -664,9 +665,10 @@ lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/place/_matches
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/place/_matchessourceconfidence.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/place/_placeprivate.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/place/_regexpidof.py
+lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/place/_withinarea.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/repository/
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/repository/__init__.py
-lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/repository/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/repository/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/repository/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/repository/${MODPY_PYCACHE}_allrepos.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/repository/${MODPY_PYCACHE}_changedsince.${MODPY_PYC_MAGIC_TAG}pyc
@@ -694,7 +696,7 @@ lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/repository/_re
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/repository/_repoprivate.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/source/
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/source/__init__.py
-lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/source/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/source/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/source/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/source/${MODPY_PYCACHE}_allsources.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/source/${MODPY_PYCACHE}_changedsince.${MODPY_PYC_MAGIC_TAG}pyc
@@ -731,7 +733,7 @@ lib/python${MODPY_VERSION}/site-packages/gramps/gen/filters/rules/source/_source
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/git_revision.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/__init__.py
-lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/${MODPY_PYCACHE}address.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/${MODPY_PYCACHE}addressbase.${MODPY_PYC_MAGIC_TAG}pyc
@@ -755,14 +757,13 @@ lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/${MODPY_PYCACHE}familyre
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/${MODPY_PYCACHE}gcalendar.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/${MODPY_PYCACHE}genderstats.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/${MODPY_PYCACHE}grampstype.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/${MODPY_PYCACHE}handle.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/${MODPY_PYCACHE}ldsord.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/${MODPY_PYCACHE}ldsordbase.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/${MODPY_PYCACHE}location.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/${MODPY_PYCACHE}locationbase.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/${MODPY_PYCACHE}markertype.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/${MODPY_PYCACHE}media.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/${MODPY_PYCACHE}mediabase.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/${MODPY_PYCACHE}mediaobj.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/${MODPY_PYCACHE}mediaref.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/${MODPY_PYCACHE}name.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/${MODPY_PYCACHE}nameorigintype.${MODPY_PYC_MAGIC_TAG}pyc
@@ -779,18 +780,17 @@ lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/${MODPY_PYCACHE}placeref
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/${MODPY_PYCACHE}placetype.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/${MODPY_PYCACHE}primaryobj.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/${MODPY_PYCACHE}privacybase.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/${MODPY_PYCACHE}privsrcnote.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/${MODPY_PYCACHE}refbase.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/${MODPY_PYCACHE}repo.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/${MODPY_PYCACHE}reporef.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/${MODPY_PYCACHE}repotype.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/${MODPY_PYCACHE}researcher.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/${MODPY_PYCACHE}secondaryobj.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/${MODPY_PYCACHE}serialize.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/${MODPY_PYCACHE}src.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/${MODPY_PYCACHE}srcattribute.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/${MODPY_PYCACHE}srcattrtype.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/${MODPY_PYCACHE}srcmediatype.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/${MODPY_PYCACHE}srcnote.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/${MODPY_PYCACHE}styledtext.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/${MODPY_PYCACHE}styledtexttag.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/${MODPY_PYCACHE}styledtexttagtype.${MODPY_PYC_MAGIC_TAG}pyc
@@ -802,7 +802,6 @@ lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/${MODPY_PYCACHE}tagbase.
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/${MODPY_PYCACHE}url.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/${MODPY_PYCACHE}urlbase.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/${MODPY_PYCACHE}urltype.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/${MODPY_PYCACHE}witness.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/address.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/addressbase.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/attrbase.py
@@ -825,14 +824,13 @@ lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/familyreltype.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/gcalendar.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/genderstats.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/grampstype.py
-lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/handle.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/ldsord.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/ldsordbase.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/location.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/locationbase.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/markertype.py
+lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/media.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/mediabase.py
-lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/mediaobj.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/mediaref.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/name.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/nameorigintype.py
@@ -849,18 +847,17 @@ lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/placeref.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/placetype.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/primaryobj.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/privacybase.py
-lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/privsrcnote.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/refbase.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/repo.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/reporef.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/repotype.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/researcher.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/secondaryobj.py
+lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/serialize.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/src.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/srcattribute.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/srcattrtype.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/srcmediatype.py
-lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/srcnote.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/styledtext.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/styledtexttag.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/styledtexttagtype.py
@@ -872,10 +869,9 @@ lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/tagbase.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/url.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/urlbase.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/urltype.py
-lib/python${MODPY_VERSION}/site-packages/gramps/gen/lib/witness.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/merge/
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/merge/__init__.py
-lib/python${MODPY_VERSION}/site-packages/gramps/gen/merge/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gramps/gen/merge/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/merge/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/merge/${MODPY_PYCACHE}diff.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/merge/${MODPY_PYCACHE}mergecitationquery.${MODPY_PYC_MAGIC_TAG}pyc
@@ -899,7 +895,7 @@ lib/python${MODPY_VERSION}/site-packages/gramps/gen/merge/mergerepositoryquery.p
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/merge/mergesourcequery.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/mime/
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/mime/__init__.py
-lib/python${MODPY_VERSION}/site-packages/gramps/gen/mime/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gramps/gen/mime/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/mime/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/mime/${MODPY_PYCACHE}_pythonmime.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/mime/${MODPY_PYCACHE}_winmime.${MODPY_PYC_MAGIC_TAG}pyc
@@ -907,7 +903,7 @@ lib/python${MODPY_VERSION}/site-packages/gramps/gen/mime/_pythonmime.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/mime/_winmime.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/plug/
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/plug/__init__.py
-lib/python${MODPY_VERSION}/site-packages/gramps/gen/plug/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gramps/gen/plug/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/plug/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/plug/${MODPY_PYCACHE}_docgenplugin.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/plug/${MODPY_PYCACHE}_export.${MODPY_PYC_MAGIC_TAG}pyc
@@ -928,7 +924,7 @@ lib/python${MODPY_VERSION}/site-packages/gramps/gen/plug/_plugin.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/plug/_pluginreg.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/plug/docbackend/
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/plug/docbackend/__init__.py
-lib/python${MODPY_VERSION}/site-packages/gramps/gen/plug/docbackend/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gramps/gen/plug/docbackend/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/plug/docbackend/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/plug/docbackend/${MODPY_PYCACHE}cairobackend.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/plug/docbackend/${MODPY_PYCACHE}docbackend.${MODPY_PYC_MAGIC_TAG}pyc
@@ -936,7 +932,7 @@ lib/python${MODPY_VERSION}/site-packages/gramps/gen/plug/docbackend/cairobackend
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/plug/docbackend/docbackend.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/plug/docgen/
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/plug/docgen/__init__.py
-lib/python${MODPY_VERSION}/site-packages/gramps/gen/plug/docgen/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gramps/gen/plug/docgen/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/plug/docgen/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/plug/docgen/${MODPY_PYCACHE}basedoc.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/plug/docgen/${MODPY_PYCACHE}drawdoc.${MODPY_PYC_MAGIC_TAG}pyc
@@ -964,7 +960,7 @@ lib/python${MODPY_VERSION}/site-packages/gramps/gen/plug/docgen/textdoc.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/plug/docgen/treedoc.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/plug/menu/
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/plug/menu/__init__.py
-lib/python${MODPY_VERSION}/site-packages/gramps/gen/plug/menu/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gramps/gen/plug/menu/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/plug/menu/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/plug/menu/${MODPY_PYCACHE}_boolean.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/plug/menu/${MODPY_PYCACHE}_booleanlist.${MODPY_PYC_MAGIC_TAG}pyc
@@ -1006,7 +1002,7 @@ lib/python${MODPY_VERSION}/site-packages/gramps/gen/plug/menu/_surnamecolor.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/plug/menu/_text.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/plug/report/
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/plug/report/__init__.py
-lib/python${MODPY_VERSION}/site-packages/gramps/gen/plug/report/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gramps/gen/plug/report/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/plug/report/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/plug/report/${MODPY_PYCACHE}_bibliography.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/plug/report/${MODPY_PYCACHE}_book.${MODPY_PYC_MAGIC_TAG}pyc
@@ -1029,13 +1025,15 @@ lib/python${MODPY_VERSION}/site-packages/gramps/gen/plug/report/utils.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/plug/utils.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/proxy/
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/proxy/__init__.py
-lib/python${MODPY_VERSION}/site-packages/gramps/gen/proxy/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gramps/gen/proxy/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/proxy/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gramps/gen/proxy/${MODPY_PYCACHE}cache.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/proxy/${MODPY_PYCACHE}filter.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/proxy/${MODPY_PYCACHE}living.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/proxy/${MODPY_PYCACHE}private.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/proxy/${MODPY_PYCACHE}proxybase.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/proxy/${MODPY_PYCACHE}referencedbyselection.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gramps/gen/proxy/cache.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/proxy/filter.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/proxy/living.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/proxy/private.py
@@ -1045,7 +1043,7 @@ lib/python${MODPY_VERSION}/site-packages/gramps/gen/recentfiles.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/relationship.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/simple/
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/simple/__init__.py
-lib/python${MODPY_VERSION}/site-packages/gramps/gen/simple/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gramps/gen/simple/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/simple/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/simple/${MODPY_PYCACHE}_simpleaccess.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/simple/${MODPY_PYCACHE}_simpledoc.${MODPY_PYC_MAGIC_TAG}pyc
@@ -1059,7 +1057,7 @@ lib/python${MODPY_VERSION}/site-packages/gramps/gen/updatecallback.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/user.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/utils/
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/utils/__init__.py
-lib/python${MODPY_VERSION}/site-packages/gramps/gen/utils/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gramps/gen/utils/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/utils/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/utils/${MODPY_PYCACHE}alive.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/utils/${MODPY_PYCACHE}callback.${MODPY_PYC_MAGIC_TAG}pyc
@@ -1077,10 +1075,13 @@ lib/python${MODPY_VERSION}/site-packages/gramps/gen/utils/${MODPY_PYCACHE}keywor
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/utils/${MODPY_PYCACHE}lds.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/utils/${MODPY_PYCACHE}libformatting.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/utils/${MODPY_PYCACHE}location.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gramps/gen/utils/${MODPY_PYCACHE}lru.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/utils/${MODPY_PYCACHE}maclocale.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/utils/${MODPY_PYCACHE}place.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/utils/${MODPY_PYCACHE}resourcepath.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/utils/${MODPY_PYCACHE}string.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gramps/gen/utils/${MODPY_PYCACHE}symbols.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gramps/gen/utils/${MODPY_PYCACHE}thumbnails.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/utils/${MODPY_PYCACHE}unknown.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/utils/alive.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/utils/callback.py
@@ -1092,7 +1093,7 @@ lib/python${MODPY_VERSION}/site-packages/gramps/gen/utils/db.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/utils/debug.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/utils/docgen/
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/utils/docgen/__init__.py
-lib/python${MODPY_VERSION}/site-packages/gramps/gen/utils/docgen/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gramps/gen/utils/docgen/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/utils/docgen/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/utils/docgen/${MODPY_PYCACHE}csvtab.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/utils/docgen/${MODPY_PYCACHE}odstab.${MODPY_PYC_MAGIC_TAG}pyc
@@ -1108,19 +1109,21 @@ lib/python${MODPY_VERSION}/site-packages/gramps/gen/utils/keyword.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/utils/lds.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/utils/libformatting.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/utils/location.py
+lib/python${MODPY_VERSION}/site-packages/gramps/gen/utils/lru.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/utils/maclocale.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/utils/place.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/utils/resource-path
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/utils/resourcepath.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/utils/string.py
+lib/python${MODPY_VERSION}/site-packages/gramps/gen/utils/symbols.py
+lib/python${MODPY_VERSION}/site-packages/gramps/gen/utils/thumbnails.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gen/utils/unknown.py
 lib/python${MODPY_VERSION}/site-packages/gramps/grampsapp.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/__init__.py
-lib/python${MODPY_VERSION}/site-packages/gramps/gui/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gramps/gui/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/${MODPY_PYCACHE}aboutdialog.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/gramps/gui/${MODPY_PYCACHE}actiongroup.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/${MODPY_PYCACHE}autocomp.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/${MODPY_PYCACHE}basesidebar.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/${MODPY_PYCACHE}clipboard.${MODPY_PYC_MAGIC_TAG}pyc
@@ -1141,15 +1144,14 @@ lib/python${MODPY_VERSION}/site-packages/gramps/gui/${MODPY_PYCACHE}managedwindo
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/${MODPY_PYCACHE}navigator.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/${MODPY_PYCACHE}pluginmanager.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/${MODPY_PYCACHE}spell.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/gramps/gui/${MODPY_PYCACHE}thumbnails.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/${MODPY_PYCACHE}tipofday.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gramps/gui/${MODPY_PYCACHE}uimanager.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/${MODPY_PYCACHE}undohistory.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/${MODPY_PYCACHE}user.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/${MODPY_PYCACHE}utilscairo.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/${MODPY_PYCACHE}viewmanager.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/aboutdialog.py
-lib/python${MODPY_VERSION}/site-packages/gramps/gui/actiongroup.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/autocomp.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/basesidebar.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/clipboard.py
@@ -1164,7 +1166,7 @@ lib/python${MODPY_VERSION}/site-packages/gramps/gui/display.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/displaystate.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/editors/
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/editors/__init__.py
-lib/python${MODPY_VERSION}/site-packages/gramps/gui/editors/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gramps/gui/editors/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/editors/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/editors/${MODPY_PYCACHE}addmedia.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/editors/${MODPY_PYCACHE}editaddress.${MODPY_PYC_MAGIC_TAG}pyc
@@ -1185,6 +1187,7 @@ lib/python${MODPY_VERSION}/site-packages/gramps/gui/editors/${MODPY_PYCACHE}edit
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/editors/${MODPY_PYCACHE}editperson.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/editors/${MODPY_PYCACHE}editpersonref.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/editors/${MODPY_PYCACHE}editplace.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gramps/gui/editors/${MODPY_PYCACHE}editplaceformat.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/editors/${MODPY_PYCACHE}editplacename.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/editors/${MODPY_PYCACHE}editplaceref.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/editors/${MODPY_PYCACHE}editprimary.${MODPY_PYC_MAGIC_TAG}pyc
@@ -1200,7 +1203,7 @@ lib/python${MODPY_VERSION}/site-packages/gramps/gui/editors/${MODPY_PYCACHE}obje
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/editors/addmedia.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/editors/displaytabs/
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/editors/displaytabs/__init__.py
-lib/python${MODPY_VERSION}/site-packages/gramps/gui/editors/displaytabs/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gramps/gui/editors/displaytabs/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/editors/displaytabs/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/editors/displaytabs/${MODPY_PYCACHE}addrembedlist.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/editors/displaytabs/${MODPY_PYCACHE}addressmodel.${MODPY_PYC_MAGIC_TAG}pyc
@@ -1318,6 +1321,7 @@ lib/python${MODPY_VERSION}/site-packages/gramps/gui/editors/editnote.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/editors/editperson.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/editors/editpersonref.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/editors/editplace.py
+lib/python${MODPY_VERSION}/site-packages/gramps/gui/editors/editplaceformat.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/editors/editplacename.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/editors/editplaceref.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/editors/editprimary.py
@@ -1332,7 +1336,7 @@ lib/python${MODPY_VERSION}/site-packages/gramps/gui/editors/filtereditor.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/editors/objectentries.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/filters/
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/filters/__init__.py
-lib/python${MODPY_VERSION}/site-packages/gramps/gui/filters/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gramps/gui/filters/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/filters/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/filters/${MODPY_PYCACHE}_filtercombobox.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/filters/${MODPY_PYCACHE}_filtermenu.${MODPY_PYC_MAGIC_TAG}pyc
@@ -1344,7 +1348,7 @@ lib/python${MODPY_VERSION}/site-packages/gramps/gui/filters/_filterstore.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/filters/_searchbar.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/filters/sidebar/
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/filters/sidebar/__init__.py
-lib/python${MODPY_VERSION}/site-packages/gramps/gui/filters/sidebar/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gramps/gui/filters/sidebar/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/filters/sidebar/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/filters/sidebar/${MODPY_PYCACHE}_citationsidebarfilter.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/filters/sidebar/${MODPY_PYCACHE}_eventsidebarfilter.${MODPY_PYC_MAGIC_TAG}pyc
@@ -1394,6 +1398,7 @@ lib/python${MODPY_VERSION}/site-packages/gramps/gui/glade/editnote.glade
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/glade/editperson.glade
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/glade/editpersonref.glade
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/glade/editplace.glade
+lib/python${MODPY_VERSION}/site-packages/gramps/gui/glade/editplaceformat.glade
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/glade/editplacename.glade
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/glade/editplaceref.glade
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/glade/editreporef.glade
@@ -1423,7 +1428,7 @@ lib/python${MODPY_VERSION}/site-packages/gramps/gui/grampsgui.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/listmodel.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/logger/
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/logger/__init__.py
-lib/python${MODPY_VERSION}/site-packages/gramps/gui/logger/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gramps/gui/logger/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/logger/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/logger/${MODPY_PYCACHE}_errorreportassistant.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/logger/${MODPY_PYCACHE}_errorview.${MODPY_PYC_MAGIC_TAG}pyc
@@ -1437,7 +1442,7 @@ lib/python${MODPY_VERSION}/site-packages/gramps/gui/makefilter.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/managedwindow.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/merge/
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/merge/__init__.py
-lib/python${MODPY_VERSION}/site-packages/gramps/gui/merge/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gramps/gui/merge/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/merge/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/merge/${MODPY_PYCACHE}mergecitation.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/merge/${MODPY_PYCACHE}mergeevent.${MODPY_PYC_MAGIC_TAG}pyc
@@ -1460,7 +1465,7 @@ lib/python${MODPY_VERSION}/site-packages/gramps/gui/merge/mergesource.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/navigator.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/plug/
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/plug/__init__.py
-lib/python${MODPY_VERSION}/site-packages/gramps/gui/plug/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gramps/gui/plug/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/plug/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/plug/${MODPY_PYCACHE}_dialogs.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/plug/${MODPY_PYCACHE}_guioptions.${MODPY_PYC_MAGIC_TAG}pyc
@@ -1471,7 +1476,7 @@ lib/python${MODPY_VERSION}/site-packages/gramps/gui/plug/_guioptions.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/plug/_windows.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/plug/export/
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/plug/export/__init__.py
-lib/python${MODPY_VERSION}/site-packages/gramps/gui/plug/export/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gramps/gui/plug/export/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/plug/export/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/plug/export/${MODPY_PYCACHE}_exportassistant.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/plug/export/${MODPY_PYCACHE}_exportoptions.${MODPY_PYC_MAGIC_TAG}pyc
@@ -1479,7 +1484,7 @@ lib/python${MODPY_VERSION}/site-packages/gramps/gui/plug/export/_exportassistant
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/plug/export/_exportoptions.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/plug/quick/
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/plug/quick/__init__.py
-lib/python${MODPY_VERSION}/site-packages/gramps/gui/plug/quick/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gramps/gui/plug/quick/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/plug/quick/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/plug/quick/${MODPY_PYCACHE}_quickreports.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/plug/quick/${MODPY_PYCACHE}_quicktable.${MODPY_PYC_MAGIC_TAG}pyc
@@ -1489,7 +1494,7 @@ lib/python${MODPY_VERSION}/site-packages/gramps/gui/plug/quick/_quicktable.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/plug/quick/_textbufdoc.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/plug/report/
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/plug/report/__init__.py
-lib/python${MODPY_VERSION}/site-packages/gramps/gui/plug/report/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gramps/gui/plug/report/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/plug/report/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/plug/report/${MODPY_PYCACHE}_bookdialog.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/plug/report/${MODPY_PYCACHE}_docreportdialog.${MODPY_PYC_MAGIC_TAG}pyc
@@ -1521,7 +1526,7 @@ lib/python${MODPY_VERSION}/site-packages/gramps/gui/plug/tool.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/pluginmanager.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/selectors/
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/selectors/__init__.py
-lib/python${MODPY_VERSION}/site-packages/gramps/gui/selectors/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gramps/gui/selectors/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/selectors/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/selectors/${MODPY_PYCACHE}baseselector.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/selectors/${MODPY_PYCACHE}selectcitation.${MODPY_PYC_MAGIC_TAG}pyc
@@ -1548,8 +1553,8 @@ lib/python${MODPY_VERSION}/site-packages/gramps/gui/selectors/selectplace.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/selectors/selectrepository.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/selectors/selectsource.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/spell.py
-lib/python${MODPY_VERSION}/site-packages/gramps/gui/thumbnails.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/tipofday.py
+lib/python${MODPY_VERSION}/site-packages/gramps/gui/uimanager.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/undohistory.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/user.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/utils.py
@@ -1557,7 +1562,7 @@ lib/python${MODPY_VERSION}/site-packages/gramps/gui/utilscairo.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/viewmanager.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/views/
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/views/__init__.py
-lib/python${MODPY_VERSION}/site-packages/gramps/gui/views/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gramps/gui/views/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/views/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/views/${MODPY_PYCACHE}bookmarks.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/views/${MODPY_PYCACHE}listview.${MODPY_PYC_MAGIC_TAG}pyc
@@ -1571,7 +1576,7 @@ lib/python${MODPY_VERSION}/site-packages/gramps/gui/views/pageview.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/views/tags.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/views/treemodels/
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/views/treemodels/__init__.py
-lib/python${MODPY_VERSION}/site-packages/gramps/gui/views/treemodels/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gramps/gui/views/treemodels/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/views/treemodels/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/views/treemodels/${MODPY_PYCACHE}basemodel.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/views/treemodels/${MODPY_PYCACHE}citationbasemodel.${MODPY_PYC_MAGIC_TAG}pyc
@@ -1580,7 +1585,6 @@ lib/python${MODPY_VERSION}/site-packages/gramps/gui/views/treemodels/${MODPY_PYC
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/views/treemodels/${MODPY_PYCACHE}eventmodel.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/views/treemodels/${MODPY_PYCACHE}familymodel.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/views/treemodels/${MODPY_PYCACHE}flatbasemodel.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/gramps/gui/views/treemodels/${MODPY_PYCACHE}lru.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/views/treemodels/${MODPY_PYCACHE}mediamodel.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/views/treemodels/${MODPY_PYCACHE}notemodel.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/views/treemodels/${MODPY_PYCACHE}peoplemodel.${MODPY_PYC_MAGIC_TAG}pyc
@@ -1595,7 +1599,6 @@ lib/python${MODPY_VERSION}/site-packages/gramps/gui/views/treemodels/citationtre
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/views/treemodels/eventmodel.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/views/treemodels/familymodel.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/views/treemodels/flatbasemodel.py
-lib/python${MODPY_VERSION}/site-packages/gramps/gui/views/treemodels/lru.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/views/treemodels/mediamodel.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/views/treemodels/notemodel.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/views/treemodels/peoplemodel.py
@@ -1605,13 +1608,15 @@ lib/python${MODPY_VERSION}/site-packages/gramps/gui/views/treemodels/sourcemodel
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/views/treemodels/treebasemodel.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/widgets/
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/widgets/__init__.py
-lib/python${MODPY_VERSION}/site-packages/gramps/gui/widgets/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gramps/gui/widgets/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/widgets/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/widgets/${MODPY_PYCACHE}basicentry.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/widgets/${MODPY_PYCACHE}buttons.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gramps/gui/widgets/${MODPY_PYCACHE}cellrenderertextedit.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/widgets/${MODPY_PYCACHE}dateentry.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/widgets/${MODPY_PYCACHE}expandcollapsearrow.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/widgets/${MODPY_PYCACHE}fanchart.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gramps/gui/widgets/${MODPY_PYCACHE}fanchart2way.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/widgets/${MODPY_PYCACHE}fanchartdesc.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/widgets/${MODPY_PYCACHE}grabbers.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/widgets/${MODPY_PYCACHE}grampletbar.${MODPY_PYC_MAGIC_TAG}pyc
@@ -1624,28 +1629,27 @@ lib/python${MODPY_VERSION}/site-packages/gramps/gui/widgets/${MODPY_PYCACHE}moni
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/widgets/${MODPY_PYCACHE}multitreeview.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/widgets/${MODPY_PYCACHE}photo.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/widgets/${MODPY_PYCACHE}placeentry.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gramps/gui/widgets/${MODPY_PYCACHE}placewithin.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/widgets/${MODPY_PYCACHE}progressdialog.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/widgets/${MODPY_PYCACHE}reorderfam.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/widgets/${MODPY_PYCACHE}selectionwidget.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/widgets/${MODPY_PYCACHE}shadebox.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/widgets/${MODPY_PYCACHE}shortlistcomboentry.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/gramps/gui/widgets/${MODPY_PYCACHE}springseparator.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/widgets/${MODPY_PYCACHE}statusbar.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/widgets/${MODPY_PYCACHE}styledtextbuffer.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/widgets/${MODPY_PYCACHE}styledtexteditor.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/gramps/gui/widgets/${MODPY_PYCACHE}toolcomboentry.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/widgets/${MODPY_PYCACHE}undoablebuffer.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/widgets/${MODPY_PYCACHE}undoableentry.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/widgets/${MODPY_PYCACHE}undoablestyledbuffer.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/widgets/${MODPY_PYCACHE}validatedcomboentry.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/widgets/${MODPY_PYCACHE}validatedmaskedentry.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/gramps/gui/widgets/${MODPY_PYCACHE}valueaction.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/gramps/gui/widgets/${MODPY_PYCACHE}valuetoolitem.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/widgets/basicentry.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/widgets/buttons.py
+lib/python${MODPY_VERSION}/site-packages/gramps/gui/widgets/cellrenderertextedit.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/widgets/dateentry.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/widgets/expandcollapsearrow.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/widgets/fanchart.py
+lib/python${MODPY_VERSION}/site-packages/gramps/gui/widgets/fanchart2way.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/widgets/fanchartdesc.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/widgets/grabbers.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/widgets/grampletbar.py
@@ -1658,30 +1662,63 @@ lib/python${MODPY_VERSION}/site-packages/gramps/gui/widgets/monitoredwidgets.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/widgets/multitreeview.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/widgets/photo.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/widgets/placeentry.py
+lib/python${MODPY_VERSION}/site-packages/gramps/gui/widgets/placewithin.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/widgets/progressdialog.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/widgets/reorderfam.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/widgets/selectionwidget.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/widgets/shadebox.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/widgets/shortlistcomboentry.py
-lib/python${MODPY_VERSION}/site-packages/gramps/gui/widgets/springseparator.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/widgets/statusbar.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/widgets/styledtextbuffer.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/widgets/styledtexteditor.py
-lib/python${MODPY_VERSION}/site-packages/gramps/gui/widgets/toolcomboentry.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/widgets/undoablebuffer.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/widgets/undoableentry.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/widgets/undoablestyledbuffer.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/widgets/validatedcomboentry.py
 lib/python${MODPY_VERSION}/site-packages/gramps/gui/widgets/validatedmaskedentry.py
-lib/python${MODPY_VERSION}/site-packages/gramps/gui/widgets/valueaction.py
-lib/python${MODPY_VERSION}/site-packages/gramps/gui/widgets/valuetoolitem.py
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/__init__.py
-lib/python${MODPY_VERSION}/site-packages/gramps/plugins/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gramps/plugins/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/db/
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/db/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gramps/plugins/db/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/db/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/db/bsddb/
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/db/bsddb/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gramps/plugins/db/bsddb/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/db/bsddb/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/db/bsddb/${MODPY_PYCACHE}bsddb.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/db/bsddb/${MODPY_PYCACHE}bsddb.gpr.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/db/bsddb/${MODPY_PYCACHE}bsddbtxn.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/db/bsddb/${MODPY_PYCACHE}cursor.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/db/bsddb/${MODPY_PYCACHE}read.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/db/bsddb/${MODPY_PYCACHE}summary.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/db/bsddb/${MODPY_PYCACHE}undoredo.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/db/bsddb/${MODPY_PYCACHE}upgrade.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/db/bsddb/${MODPY_PYCACHE}write.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/db/bsddb/bsddb.gpr.py
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/db/bsddb/bsddb.py
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/db/bsddb/bsddbtxn.py
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/db/bsddb/cursor.py
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/db/bsddb/read.py
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/db/bsddb/summary.py
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/db/bsddb/undoredo.py
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/db/bsddb/upgrade.py
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/db/bsddb/write.py
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/db/dbapi/
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/db/dbapi/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gramps/plugins/db/dbapi/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/db/dbapi/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/db/dbapi/${MODPY_PYCACHE}dbapi.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/db/dbapi/${MODPY_PYCACHE}sqlite.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/db/dbapi/${MODPY_PYCACHE}sqlite.gpr.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/db/dbapi/dbapi.py
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/db/dbapi/sqlite.gpr.py
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/db/dbapi/sqlite.py
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/docgen/
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/docgen/__init__.py
-lib/python${MODPY_VERSION}/site-packages/gramps/plugins/docgen/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gramps/plugins/docgen/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/docgen/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/docgen/${MODPY_PYCACHE}asciidoc.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/docgen/${MODPY_PYCACHE}cairodoc.${MODPY_PYC_MAGIC_TAG}pyc
@@ -1704,7 +1741,7 @@ lib/python${MODPY_VERSION}/site-packages/gramps/plugins/docgen/rtfdoc.py
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/docgen/svgdrawdoc.py
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/drawreport/
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/drawreport/__init__.py
-lib/python${MODPY_VERSION}/site-packages/gramps/plugins/drawreport/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gramps/plugins/drawreport/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/drawreport/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/drawreport/${MODPY_PYCACHE}ancestortree.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/drawreport/${MODPY_PYCACHE}calendarreport.${MODPY_PYC_MAGIC_TAG}pyc
@@ -1722,7 +1759,7 @@ lib/python${MODPY_VERSION}/site-packages/gramps/plugins/drawreport/statisticscha
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/drawreport/timeline.py
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/export/
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/export/__init__.py
-lib/python${MODPY_VERSION}/site-packages/gramps/plugins/export/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gramps/plugins/export/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/export/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/export/${MODPY_PYCACHE}export.gpr.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/export/${MODPY_PYCACHE}exportcsv.${MODPY_PYC_MAGIC_TAG}pyc
@@ -1734,22 +1771,17 @@ lib/python${MODPY_VERSION}/site-packages/gramps/plugins/export/${MODPY_PYCACHE}e
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/export/${MODPY_PYCACHE}exportvcard.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/export/${MODPY_PYCACHE}exportxml.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/export/export.gpr.py
-lib/python${MODPY_VERSION}/site-packages/gramps/plugins/export/exportcsv.glade
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/export/exportcsv.py
-lib/python${MODPY_VERSION}/site-packages/gramps/plugins/export/exportftree.glade
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/export/exportftree.py
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/export/exportgedcom.py
-lib/python${MODPY_VERSION}/site-packages/gramps/plugins/export/exportgeneweb.glade
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/export/exportgeneweb.py
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/export/exportpkg.py
-lib/python${MODPY_VERSION}/site-packages/gramps/plugins/export/exportvcalendar.glade
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/export/exportvcalendar.py
-lib/python${MODPY_VERSION}/site-packages/gramps/plugins/export/exportvcard.glade
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/export/exportvcard.py
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/export/exportxml.py
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/gramplet/
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/gramplet/__init__.py
-lib/python${MODPY_VERSION}/site-packages/gramps/plugins/gramplet/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gramps/plugins/gramplet/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/gramplet/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/gramplet/${MODPY_PYCACHE}ageondategramplet.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/gramplet/${MODPY_PYCACHE}agestats.${MODPY_PYC_MAGIC_TAG}pyc
@@ -1759,9 +1791,11 @@ lib/python${MODPY_VERSION}/site-packages/gramps/plugins/gramplet/${MODPY_PYCACHE
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/gramplet/${MODPY_PYCACHE}calendargramplet.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/gramplet/${MODPY_PYCACHE}children.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/gramplet/${MODPY_PYCACHE}citations.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/gramplet/${MODPY_PYCACHE}coordinates.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/gramplet/${MODPY_PYCACHE}descendant.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/gramplet/${MODPY_PYCACHE}eval.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/gramplet/${MODPY_PYCACHE}events.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/gramplet/${MODPY_PYCACHE}fanchart2waygramplet.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/gramplet/${MODPY_PYCACHE}fanchartdescgramplet.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/gramplet/${MODPY_PYCACHE}fanchartgramplet.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/gramplet/${MODPY_PYCACHE}faqgramplet.${MODPY_PYC_MAGIC_TAG}pyc
@@ -1799,9 +1833,11 @@ lib/python${MODPY_VERSION}/site-packages/gramps/plugins/gramplet/backlinks.py
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/gramplet/calendargramplet.py
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/gramplet/children.py
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/gramplet/citations.py
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/gramplet/coordinates.py
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/gramplet/descendant.py
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/gramplet/eval.py
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/gramplet/events.py
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/gramplet/fanchart2waygramplet.py
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/gramplet/fanchartdescgramplet.py
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/gramplet/fanchartgramplet.py
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/gramplet/faqgramplet.py
@@ -1833,7 +1869,7 @@ lib/python${MODPY_VERSION}/site-packages/gramps/plugins/gramplet/welcomegramplet
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/gramplet/whatsnext.py
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/graph/
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/graph/__init__.py
-lib/python${MODPY_VERSION}/site-packages/gramps/plugins/graph/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gramps/plugins/graph/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/graph/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/graph/${MODPY_PYCACHE}graphplugins.gpr.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/graph/${MODPY_PYCACHE}gvfamilylines.${MODPY_PYC_MAGIC_TAG}pyc
@@ -1845,7 +1881,7 @@ lib/python${MODPY_VERSION}/site-packages/gramps/plugins/graph/gvhourglass.py
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/graph/gvrelgraph.py
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/importer/
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/importer/__init__.py
-lib/python${MODPY_VERSION}/site-packages/gramps/plugins/importer/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gramps/plugins/importer/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/importer/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/importer/${MODPY_PYCACHE}import.gpr.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/importer/${MODPY_PYCACHE}importcsv.${MODPY_PYC_MAGIC_TAG}pyc
@@ -1863,12 +1899,13 @@ lib/python${MODPY_VERSION}/site-packages/gramps/plugins/importer/importgedcom.py
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/importer/importgeneweb.py
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/importer/importgpkg.py
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/importer/importgrdb.py
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/importer/importprogen.glade
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/importer/importprogen.py
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/importer/importvcard.py
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/importer/importxml.py
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/lib/
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/lib/__init__.py
-lib/python${MODPY_VERSION}/site-packages/gramps/plugins/lib/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gramps/plugins/lib/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/lib/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/lib/${MODPY_PYCACHE}libcairodoc.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/lib/${MODPY_PYCACHE}libgedcom.${MODPY_PYC_MAGIC_TAG}pyc
@@ -1886,11 +1923,11 @@ lib/python${MODPY_VERSION}/site-packages/gramps/plugins/lib/${MODPY_PYCACHE}libp
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/lib/${MODPY_PYCACHE}libplaceimport.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/lib/${MODPY_PYCACHE}libplaceview.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/lib/${MODPY_PYCACHE}libplugins.gpr.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/lib/${MODPY_PYCACHE}libprogen.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/lib/${MODPY_PYCACHE}librecords.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/lib/${MODPY_PYCACHE}librecurse.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/lib/${MODPY_PYCACHE}libsubstkeyword.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/lib/${MODPY_PYCACHE}libtreebase.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/gramps/plugins/lib/holidays.xml
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/lib/libcairodoc.py
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/lib/libgedcom.py
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/lib/libgrampsxml.py
@@ -1907,13 +1944,14 @@ lib/python${MODPY_VERSION}/site-packages/gramps/plugins/lib/libpersonview.py
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/lib/libplaceimport.py
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/lib/libplaceview.py
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/lib/libplugins.gpr.py
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/lib/libprogen.py
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/lib/librecords.py
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/lib/librecurse.py
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/lib/libsubstkeyword.py
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/lib/libtreebase.py
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/lib/maps/
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/lib/maps/__init__.py
-lib/python${MODPY_VERSION}/site-packages/gramps/plugins/lib/maps/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gramps/plugins/lib/maps/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/lib/maps/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/lib/maps/${MODPY_PYCACHE}cairoprint.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/lib/maps/${MODPY_PYCACHE}constants.${MODPY_PYC_MAGIC_TAG}pyc
@@ -1945,7 +1983,7 @@ lib/python${MODPY_VERSION}/site-packages/gramps/plugins/lib/maps/placeselection.
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/lib/maps/selectionlayer.py
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/mapservices/
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/mapservices/__init__.py
-lib/python${MODPY_VERSION}/site-packages/gramps/plugins/mapservices/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gramps/plugins/mapservices/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/mapservices/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/mapservices/${MODPY_PYCACHE}eniroswedenmap.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/mapservices/${MODPY_PYCACHE}googlemap.${MODPY_PYC_MAGIC_TAG}pyc
@@ -1957,7 +1995,7 @@ lib/python${MODPY_VERSION}/site-packages/gramps/plugins/mapservices/mapservice.g
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/mapservices/openstreetmap.py
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/quickview/
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/quickview/__init__.py
-lib/python${MODPY_VERSION}/site-packages/gramps/plugins/quickview/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gramps/plugins/quickview/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/quickview/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/quickview/${MODPY_PYCACHE}ageondate.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/quickview/${MODPY_PYCACHE}all_events.${MODPY_PYC_MAGIC_TAG}pyc
@@ -1987,7 +2025,7 @@ lib/python${MODPY_VERSION}/site-packages/gramps/plugins/quickview/samesurnames.p
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/quickview/siblings.py
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/rel/
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/rel/__init__.py
-lib/python${MODPY_VERSION}/site-packages/gramps/plugins/rel/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gramps/plugins/rel/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/rel/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/rel/${MODPY_PYCACHE}rel_ca.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/rel/${MODPY_PYCACHE}rel_cs.${MODPY_PYC_MAGIC_TAG}pyc
@@ -2033,7 +2071,7 @@ lib/python${MODPY_VERSION}/site-packages/gramps/plugins/rel/rel_uk.py
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/rel/relplugins.gpr.py
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/sidebar/
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/sidebar/__init__.py
-lib/python${MODPY_VERSION}/site-packages/gramps/plugins/sidebar/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gramps/plugins/sidebar/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/sidebar/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/sidebar/${MODPY_PYCACHE}categorysidebar.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/sidebar/${MODPY_PYCACHE}dropdownsidebar.${MODPY_PYC_MAGIC_TAG}pyc
@@ -2045,7 +2083,7 @@ lib/python${MODPY_VERSION}/site-packages/gramps/plugins/sidebar/expandersidebar.
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/sidebar/sidebar.gpr.py
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/textreport/
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/textreport/__init__.py
-lib/python${MODPY_VERSION}/site-packages/gramps/plugins/textreport/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gramps/plugins/textreport/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/textreport/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/textreport/${MODPY_PYCACHE}alphabeticalindex.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/textreport/${MODPY_PYCACHE}ancestorreport.${MODPY_PYC_MAGIC_TAG}pyc
@@ -2089,7 +2127,7 @@ lib/python${MODPY_VERSION}/site-packages/gramps/plugins/textreport/tagreport.py
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/textreport/textplugins.gpr.py
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/tool/
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/tool/__init__.py
-lib/python${MODPY_VERSION}/site-packages/gramps/plugins/tool/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gramps/plugins/tool/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/tool/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/tool/${MODPY_PYCACHE}changenames.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/tool/${MODPY_PYCACHE}changetypes.${MODPY_PYC_MAGIC_TAG}pyc
@@ -2098,8 +2136,8 @@ lib/python${MODPY_VERSION}/site-packages/gramps/plugins/tool/${MODPY_PYCACHE}dat
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/tool/${MODPY_PYCACHE}dumpgenderstats.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/tool/${MODPY_PYCACHE}eventcmp.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/tool/${MODPY_PYCACHE}eventnames.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/gramps/plugins/tool/${MODPY_PYCACHE}extractcity.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/tool/${MODPY_PYCACHE}finddupes.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/tool/${MODPY_PYCACHE}findloop.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/tool/${MODPY_PYCACHE}mediamanager.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/tool/${MODPY_PYCACHE}mergecitations.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/tool/${MODPY_PYCACHE}notrelated.${MODPY_PYC_MAGIC_TAG}pyc
@@ -2110,6 +2148,7 @@ lib/python${MODPY_VERSION}/site-packages/gramps/plugins/tool/${MODPY_PYCACHE}reb
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/tool/${MODPY_PYCACHE}rebuildgenderstat.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/tool/${MODPY_PYCACHE}rebuildrefmap.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/tool/${MODPY_PYCACHE}relcalc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/tool/${MODPY_PYCACHE}removespaces.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/tool/${MODPY_PYCACHE}removeunused.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/tool/${MODPY_PYCACHE}reorderids.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/tool/${MODPY_PYCACHE}sortevents.${MODPY_PYC_MAGIC_TAG}pyc
@@ -2128,9 +2167,10 @@ lib/python${MODPY_VERSION}/site-packages/gramps/plugins/tool/dumpgenderstats.py
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/tool/eventcmp.glade
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/tool/eventcmp.py
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/tool/eventnames.py
-lib/python${MODPY_VERSION}/site-packages/gramps/plugins/tool/extractcity.py
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/tool/finddupes.glade
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/tool/finddupes.py
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/tool/findloop.glade
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/tool/findloop.py
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/tool/mediamanager.py
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/tool/mergecitations.glade
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/tool/mergecitations.py
@@ -2146,8 +2186,11 @@ lib/python${MODPY_VERSION}/site-packages/gramps/plugins/tool/rebuildgenderstat.p
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/tool/rebuildrefmap.py
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/tool/relcalc.glade
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/tool/relcalc.py
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/tool/removespaces.glade
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/tool/removespaces.py
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/tool/removeunused.glade
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/tool/removeunused.py
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/tool/reorderids.glade
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/tool/reorderids.py
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/tool/sortevents.py
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/tool/testcasegenerator.py
@@ -2157,13 +2200,14 @@ lib/python${MODPY_VERSION}/site-packages/gramps/plugins/tool/verify.glade
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/tool/verify.py
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/view/
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/view/__init__.py
-lib/python${MODPY_VERSION}/site-packages/gramps/plugins/view/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gramps/plugins/view/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/view/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/view/${MODPY_PYCACHE}citationlistview.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/view/${MODPY_PYCACHE}citationtreeview.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/view/${MODPY_PYCACHE}dashboardview.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/view/${MODPY_PYCACHE}eventview.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/view/${MODPY_PYCACHE}familyview.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/view/${MODPY_PYCACHE}fanchart2wayview.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/view/${MODPY_PYCACHE}fanchartdescview.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/view/${MODPY_PYCACHE}fanchartview.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/view/${MODPY_PYCACHE}geoclose.${MODPY_PYC_MAGIC_TAG}pyc
@@ -2190,6 +2234,7 @@ lib/python${MODPY_VERSION}/site-packages/gramps/plugins/view/citationtreeview.py
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/view/dashboardview.py
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/view/eventview.py
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/view/familyview.py
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/view/fanchart2wayview.py
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/view/fanchartdescview.py
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/view/fanchartview.py
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/view/geoclose.py
@@ -2213,17 +2258,61 @@ lib/python${MODPY_VERSION}/site-packages/gramps/plugins/view/sourceview.py
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/view/view.gpr.py
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/webreport/
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/webreport/__init__.py
-lib/python${MODPY_VERSION}/site-packages/gramps/plugins/webreport/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gramps/plugins/webreport/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/webreport/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/webreport/${MODPY_PYCACHE}addressbook.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/webreport/${MODPY_PYCACHE}addressbooklist.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/webreport/${MODPY_PYCACHE}basepage.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/webreport/${MODPY_PYCACHE}buchheim.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/webreport/${MODPY_PYCACHE}citation.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/webreport/${MODPY_PYCACHE}common.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/webreport/${MODPY_PYCACHE}contact.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/webreport/${MODPY_PYCACHE}download.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/webreport/${MODPY_PYCACHE}event.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/webreport/${MODPY_PYCACHE}family.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/webreport/${MODPY_PYCACHE}home.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/webreport/${MODPY_PYCACHE}introduction.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/webreport/${MODPY_PYCACHE}layout.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/webreport/${MODPY_PYCACHE}media.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/webreport/${MODPY_PYCACHE}narrativeweb.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/webreport/${MODPY_PYCACHE}person.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/webreport/${MODPY_PYCACHE}place.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/webreport/${MODPY_PYCACHE}repository.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/webreport/${MODPY_PYCACHE}source.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/webreport/${MODPY_PYCACHE}statistics.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/webreport/${MODPY_PYCACHE}surname.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/webreport/${MODPY_PYCACHE}surnamelist.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/webreport/${MODPY_PYCACHE}thumbnail.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/webreport/${MODPY_PYCACHE}webcal.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/webreport/${MODPY_PYCACHE}webplugins.gpr.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/webreport/addressbook.py
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/webreport/addressbooklist.py
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/webreport/basepage.py
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/webreport/buchheim.py
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/webreport/citation.py
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/webreport/common.py
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/webreport/contact.py
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/webreport/download.py
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/webreport/event.py
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/webreport/family.py
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/webreport/home.py
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/webreport/introduction.py
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/webreport/layout.py
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/webreport/media.py
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/webreport/narrativeweb.py
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/webreport/person.py
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/webreport/place.py
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/webreport/repository.py
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/webreport/source.py
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/webreport/statistics.py
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/webreport/surname.py
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/webreport/surnamelist.py
+lib/python${MODPY_VERSION}/site-packages/gramps/plugins/webreport/thumbnail.py
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/webreport/webcal.py
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/webreport/webplugins.gpr.py
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/webstuff/
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/webstuff/__init__.py
-lib/python${MODPY_VERSION}/site-packages/gramps/plugins/webstuff/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gramps/plugins/webstuff/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/webstuff/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/webstuff/${MODPY_PYCACHE}webstuff.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/webstuff/${MODPY_PYCACHE}webstuff.gpr.${MODPY_PYC_MAGIC_TAG}pyc
@@ -2231,7 +2320,7 @@ lib/python${MODPY_VERSION}/site-packages/gramps/plugins/webstuff/webstuff.gpr.py
 lib/python${MODPY_VERSION}/site-packages/gramps/plugins/webstuff/webstuff.py
 lib/python${MODPY_VERSION}/site-packages/gramps/test/
 lib/python${MODPY_VERSION}/site-packages/gramps/test/__init__.py
-lib/python${MODPY_VERSION}/site-packages/gramps/test/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gramps/test/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/gramps/test/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/test/${MODPY_PYCACHE}regrtest.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gramps/test/${MODPY_PYCACHE}test_util.${MODPY_PYC_MAGIC_TAG}pyc
@@ -2263,9 +2352,8 @@ share/doc/gramps/AUTHORS
 share/doc/gramps/COPYING
 share/doc/gramps/FAQ
 share/doc/gramps/INSTALL
-share/doc/gramps/LICENSE
 share/doc/gramps/NEWS
-share/doc/gramps/README
+share/doc/gramps/README.md
 share/doc/gramps/TODO
 share/doc/gramps/example/
 share/doc/gramps/example/gedcom/
@@ -2284,13 +2372,11 @@ share/doc/gramps/example/gramps/O3.jpg
 share/doc/gramps/example/gramps/O4.jpg
 share/doc/gramps/example/gramps/O5.jpg
 share/doc/gramps/example/gramps/data.gramps
-share/doc/gramps/example/gramps/datetest.gramps
 share/doc/gramps/example/gramps/example.gramps
 share/doc/gramps/example/gramps/scanned_microfilm.png
 share/gramps/
 share/gramps/authors.xml
 share/gramps/css/
-share/gramps/css/GeoView.css
 share/gramps/css/Web_Basic-Ash.css
 share/gramps/css/Web_Basic-Blue.css
 share/gramps/css/Web_Basic-Cypress.css
@@ -2330,6 +2416,9 @@ share/gramps/css/swanky-purse/images/ui-icons_f9f2bd_256x240.png
 share/gramps/css/swanky-purse/images/ui-icons_ff7519_256x240.png
 share/gramps/css/swanky-purse/jquery-ui-1.7.2.custom.css
 share/gramps/css/swanky-purse/jquery-ui-1.7.3.custom.css
+share/gramps/grampsxml.dtd
+share/gramps/grampsxml.rng
+share/gramps/holidays.xml
 share/gramps/images/
 share/gramps/images/add-parent-existing-family.png
 share/gramps/images/add.png
@@ -2372,6 +2461,7 @@ share/gramps/images/hicolor/16x16/actions/gramps-date.png
 share/gramps/images/hicolor/16x16/actions/gramps-event.png
 share/gramps/images/hicolor/16x16/actions/gramps-family.png
 share/gramps/images/hicolor/16x16/actions/gramps-fanchart.png
+share/gramps/images/hicolor/16x16/actions/gramps-fanchart2way.png
 share/gramps/images/hicolor/16x16/actions/gramps-fanchartdesc.png
 share/gramps/images/hicolor/16x16/actions/gramps-font-bgcolor.png
 share/gramps/images/hicolor/16x16/actions/gramps-font-color.png
@@ -2430,6 +2520,7 @@ share/gramps/images/hicolor/22x22/actions/gramps-date.png
 share/gramps/images/hicolor/22x22/actions/gramps-event.png
 share/gramps/images/hicolor/22x22/actions/gramps-family.png
 share/gramps/images/hicolor/22x22/actions/gramps-fanchart.png
+share/gramps/images/hicolor/22x22/actions/gramps-fanchart2way.png
 share/gramps/images/hicolor/22x22/actions/gramps-fanchartdesc.png
 share/gramps/images/hicolor/22x22/actions/gramps-font-bgcolor.png
 share/gramps/images/hicolor/22x22/actions/gramps-font-color.png
@@ -2472,7 +2563,6 @@ share/gramps/images/hicolor/22x22/actions/gramps-zoom-out.png
 share/gramps/images/hicolor/22x22/actions/gramps.png
 share/gramps/images/hicolor/24x24/
 share/gramps/images/hicolor/24x24/actions/
-share/gramps/images/hicolor/24x24/actions/add-parent-existing-family.png
 share/gramps/images/hicolor/24x24/actions/geo-fixed-zoom.png
 share/gramps/images/hicolor/24x24/actions/geo-free-zoom.png
 share/gramps/images/hicolor/24x24/actions/geo-place-add.png
@@ -2494,6 +2584,7 @@ share/gramps/images/hicolor/24x24/actions/gramps-date.png
 share/gramps/images/hicolor/24x24/actions/gramps-event.png
 share/gramps/images/hicolor/24x24/actions/gramps-family.png
 share/gramps/images/hicolor/24x24/actions/gramps-fanchart.png
+share/gramps/images/hicolor/24x24/actions/gramps-fanchart2way.png
 share/gramps/images/hicolor/24x24/actions/gramps-fanchartdesc.png
 share/gramps/images/hicolor/24x24/actions/gramps-font-bgcolor.png
 share/gramps/images/hicolor/24x24/actions/gramps-font-color.png
@@ -2557,6 +2648,7 @@ share/gramps/images/hicolor/48x48/actions/gramps-date.png
 share/gramps/images/hicolor/48x48/actions/gramps-event.png
 share/gramps/images/hicolor/48x48/actions/gramps-family.png
 share/gramps/images/hicolor/48x48/actions/gramps-fanchart.png
+share/gramps/images/hicolor/48x48/actions/gramps-fanchart2way.png
 share/gramps/images/hicolor/48x48/actions/gramps-fanchartdesc.png
 share/gramps/images/hicolor/48x48/actions/gramps-font-bgcolor.png
 share/gramps/images/hicolor/48x48/actions/gramps-font-color.png
@@ -2621,6 +2713,7 @@ share/gramps/images/hicolor/scalable/actions/gramps-date.svg
 share/gramps/images/hicolor/scalable/actions/gramps-event.svg
 share/gramps/images/hicolor/scalable/actions/gramps-family.svg
 share/gramps/images/hicolor/scalable/actions/gramps-fanchart.svg
+share/gramps/images/hicolor/scalable/actions/gramps-fanchart2way.svg
 share/gramps/images/hicolor/scalable/actions/gramps-fanchartdesc.svg
 share/gramps/images/hicolor/scalable/actions/gramps-font-bgcolor.svg
 share/gramps/images/hicolor/scalable/actions/gramps-font-color.svg
@@ -2736,6 +2829,7 @@ share/locale/sl/LC_MESSAGES/gramps.mo
 share/locale/sq/LC_MESSAGES/gramps.mo
 share/locale/sr/LC_MESSAGES/gramps.mo
 share/locale/sv/LC_MESSAGES/gramps.mo
+share/locale/ta/LC_MESSAGES/gramps.mo
 share/locale/tr/LC_MESSAGES/gramps.mo
 share/locale/uk/LC_MESSAGES/gramps.mo
 share/locale/vi/LC_MESSAGES/gramps.mo