support -plain
Merge remote-tracking branch 'upstream/master'
@cadrian was faster