Merge commits from upstream

Fixes broken link to issues page.