Sensible Sidekiq defaults
Merge remote-tracking branch 'upstream/master'

Get the latest upstream fixes.