同步 git Commits on Aug 15, 2014 SVN r116
Signed-off-by: MapleEve <esanisa@gmail.com>
Signed-off-by: MapleEve <esanisa@gmail.com>