Merge "Don't loop forever on 0-length options." into nyc-dev