merge svn r67


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