Merge in Resque Enhancements.