Merge branch 'master' into fastcgi
Merge branch 'master' of https://github.com/ShonM/php-resque