Merge branch 'hotfix-0.3.13'

Conflicts:
	CHANGES.md

CHANGES.md

@@ -19,6 +19,13 @@
 - Fix: `Queue.empty()` now correctly deletes job hashes from Redis.
 
 
+### 0.3.13
+(December 17th, 2013)
+
+- Bug fix where the worker crashes on jobs that have their timeout explicitly
+  removed.  Thanks for reporting, @algrs.
+
+
 ### 0.3.12
 (December 16th, 2013)
 

rq/version.py

@@ -1 +1 @@
-VERSION = '0.3.12'
+VERSION = '0.3.13'

rq/worker.py

@@ -322,7 +322,7 @@ class Worker(object):
                 self.log.info('%s: %s (%s)' % (green(queue.name),
                               blue(job.description), job.id))
 
-                self.heartbeat((job.timeout or Queue.DEFAULT_TIMEOUT) + 60)
+                self.heartbeat((job.timeout or 180) + 60)
                 self.fork_and_perform_job(job)
                 self.heartbeat()
                 if job.status == Status.FINISHED: