Take upstream r1455 to fix issue #95.