Merge branch 'develop'
Don't clobber existing Resque.after_fork hook.