Merge branch 'wpa-dist'