Merge branch 'master'
Merge branch 'master' of https://github.com/eousphoros/rq

Conflicts:
	version.rb