Fix an options-processing bug on some platforms (e.g., MacOS).
Merge branch '1.0.x'