Resynchronise with babeld-1.3.1.
8 files changed