Merge branch 'master' into debian
Package 10.2.1

This includes changes to the upstream build system, as well
as correcting the version in install.rdf to 10.2.1