合并spring官方代码

Comment From: pivotal-issuemaster

@chengwenyue Please sign the Contributor License Agreement!

Click here to manually synchronize the status of this Pull Request.

See the FAQ for frequently asked questions.