Merge branch 'fix-distcheck'