Merge pull request #3 from acsone/8.0

Forward port 7.0 until e103aff