Scott Emmons - 2014-09-23

Hmm, well this patch breaks parsing of -S for invalid values for some reason, haven't had a chance to look into that deeper. It does allow the overrides, at least.