Missing && typo
Merge pull request #1201 from byteGator/Missing-&&-

Missing && typo
Merge branch 'develop' into testing