Because github is dumb and wants to do conflicts in the mirror PRs. I wonder if this works... closes #786 closes #785