Don't quit the bootstrap script if 'check' is already installed.
Remove a resolved TODO.
Merge remote-tracking branch 'origin/next' into next