Merge branches 'master' and 'debian' into release