Also, add Jacob Bishop to the list of contributors, since this is his work. Thanks, Jacob! (cherry picked from commit 824b0313b3da3b1d504c1cff6c320fcd54749c92)