Merge commit 'jelmer/master'