Merge branch '1.0'
captcha base64
Merge branch 'master' into 1.0