Merge pull request #3573 from nikil/bitlbee