Merge branch 'master' into debian
Release 10.0.2