Merge https://trac.osgeo.org/grass/changeset/31184

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@31185 15284696-431f-4ddb-bdfa-cd5b030d7da7