Goodbye incomprehensible code indent from buffer.rb and output.rb
Merge commit '4675251f43754669c51d3a0a5d6d5b4fa5d38c2e' into windows