Merge pull request #255 from zorun/babeld_drop_compat