paperclip_background back again on night shift (too much load)
Merge branch 'master' into develop