Merge pull request #3218 from bazz2/master

[place it into error place]
This commit is contained in:
bazz2 2015-08-22 08:50:06 +08:00
commit 808c70a8ad