Update Master

It's been a while since the `develop` branch has been merged into master. Setting up this PR now for people to identify any bugs or issues with `develop` before we merge it into `master`.

I was thinking we can merge this in sometime this weekend, giving ample time to find any potential glaring issues.

I've been running the `develop` branch for a while now with no real issues, so it's really these few PRs that got merged in today that need to be tested.