Merge pull request #856 from stintel/bird