Merge from master

@joshuafleck @esbel @pendletons @nronas @Joachim31415 

Merge from mperham/sidekiq