Merge pull request #605 from fadils/master

Update to 3.8.2