Merge pull request #2457 from mdeweerd/patch-1 'which' -> 'that' because the clause is essential to the meaning