Merge pull request #384 from ariard/2019-10-clean-warnings