branch 0.5.20
Merge branch 'master' into 0.5.20
wp6