Merge branch '2.0release' into develop

This commit is contained in:
winlin 2015-11-02 13:51:07 +08:00
commit 6e3eb50b78