Merge pull request #1 from acsone/7.0

Forward port of 6.1 branch