Merge branch 'ab/parse-options-cleanup'

Last minute fix to the update already in 'master'.

* ab/parse-options-cleanup:
  parse-options.[ch]: revert use of "enum" for parse_options()

diff --cc parse-options.c
Simple merge

diff --cc parse-options.h
Simple merge