Merge pull request #1825 from ripienaar/missing_which