6.x-1.0-beta2
105c6819 · fix #537160 and #527504 ·