Merge upstream

I haven't looked for what caused the issue in these changes, but the trigger phrases weren't working correctly for multiple jobs on the same GitHub repository before merging, and they are now.