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