morris 98e19b3355 Merge branch 'contrib/github_pr_8496' into 'master' %!s(int64=4) %!d(string=hai) anos
..
hal 98e19b3355 Merge branch 'contrib/github_pr_8496' into 'master' %!s(int64=4) %!d(string=hai) anos