Merge branch 'version-3.0' to fix some late bugs

If you are pulling and get an error about rewritten history, it is
because git failed to merge previously, so I git reset --hard and
re-merged