"dist" -> "jar" in help output
Merge remote-tracking branch 'upstream/master'