Merge pull request #561 from fblaese/babeld-master