Merge pull request #4058 from nikil/bitlbee