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