updated from mybatis/mybatis-3