Prepare for v0.3.2
Merge branch 'master' into 0.3.x