Merge pull request #252 from zorun/babeld_maintainer