[soundconverter/f17] (4 commits) ...Merge branch 'master' into f18

[Michael Schwendt]

Summary of changes:

  cf36b9e... Merge upstream fix for batch mode running into non-URI file (*)
  9e72989... Make "Cancel" also end the wait-for-tagreaders loop, since  (*)
  aaed201... 2.0.4-20 (*)
  8631440... Merge branch 'master' into f18 (*)

(*) This commit already existed in another branch; no separate mail sent