Merge pull request #2206 from SSPMark/release-2.1

! Fix syntax errors in Who.php