Use prelude-require-packages everywhere
Merge remote-tracking branch 'upstream/master'