Merge remote-tracking branch 'origin/0.3.x'