tree c9353d661a150baaaca0a693ee12366cc346a736
parent 784cc82a0570fda2abb659b23fccdb65e169908e
author David Ostrovsky <david@ostrovsky.org> 1555651468 -0700
committer Luca Milanesio <luca.milanesio@gmail.com> 1555713734 +0200

Adapt to changes on recent master

Change-Id: Ie1dee4631cef2d9d5f7de5165caa83b9cbbec3c4