Merge commit 'gnu/master' into test