Merge branch 'dist'