merge svn r9
Signed-off-by: MapleEve <esanisa@gmail.com>