merge SVN r113

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