Merge pull request #1902 from herwinw/v30x-debian-stretch