Version bump to 0.3.20
Merge branch 'release0.3.20' into develop