Hand-made merge based on the following commit.

commit eb517ef0
Author: Yusei Tahara <yusei@nexedi.com>
Date:   Fri Feb 22 15:11:15 2019 +0900

    Add faketime for tests.