Porting my fix from gramps40: git diff gramps40^ gramps40 | git apply svn: r22730
svn: r22598
svn: r7685