merge from 3.2 - Fix issue13726: -S accepts an argument just as --start.