Merge pull request #1619 from sjinks/1.2.5

[1.2.5] Fix issues with beanstalkd