Merge remote-tracking branch 'origin/master' into reserver

Author: rayward

composer.json

@@ -21,7 +21,7 @@
 		"php": ">=5.3.0",
 		"ext-pcntl": "*",
 		"colinmollenhour/credis": "~1.7",
-		"psr/log": "1.0.0"
+		"psr/log": "~1.0"
 	},
 	"suggest": {
 		"ext-proctitle": "Allows php-resque to rename the title of UNIX processes to show the status of a worker.",