Run IntelliJ "Optimize Imports"
Use BoundedInputStreams when using mark()/reset() to avoid invalidating the mark
Merge remote-tracking branch 'eric/imports'