Merge remote branch 'pub/master'

diff --combined pysawsim/parameter_error.py
index c8c20e60fc6980469339bf093eaf199941e6bf2f,b75b31043a4392700c1d114c545cb65b28d09afa..f56ba26da72511d93cd49590fa39177c22dd80f9
--- 1/pysawsim/parameter_error.py
--- 2/pysawsim/parameter_error.py
+++ b/pysawsim/parameter_error.py
@@@ -80,8 -80,7 +80,7 @@@ def main(argv=None)
      >>> f = tempfile.NamedTemporaryFile()
      >>> f.write(EXAMPLE_HISTOGRAM_FILE_CONTENTS)
      >>> f.flush()
-     >>> main(['-s', 'bin/sawsim',
-     ...       '-r', '[1e-6,1e-4,3]', '--log',
+     >>> main(['-r', '[1e-6,1e-4,3]', '--log',
      ...       '-N', '4', '-t', '0.8',
      ...       f.name])
      ... # doctest: +ELLIPSIS, +NORMALIZE_WHITESPACE, +REPORT_UDIFF
@@@ -125,7 -124,6 +124,7 @@@
              'one ends).',
              ])
      parser = OptionParser(usage, epilog=epilog)
 +    parser.format_epilog = lambda formatter: epilog+'\n'
      for option in sr.optparse_options:
          if option.dest == 'param_string':
              continue