Eliminate leading space from $fnd
Merge branch 'master' into ordered_args
Don't need to do a substr cause we've removed leading space from $fnd