Update upstream

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>