Merge branch 'master' into temporary branch debian