Fixed bug in client. Needs parens on if logic (and not on both or clauses unless parens)
Merge pull request #19183 from SmithSamuelM/sam_20141222

Fixed bug in client. Needs parens on if logic (and not on both or clause...