sync gramps40 to trunk (two places)

git-svn-id: svn+ssh://svn.code.sf.net/p/gramps/code/branches/maintenance/gramps40@21426 4ae1f11a-8b86-4847-b8af-ab372f36d1fd