Fix issue #382
Merge remote-tracking branch 'origin/pr/468'

Conflicts:
	lib/delayed/worker.rb