Merge pull request #426 from robimarko/babeld-1.8.4