Merge master to production

I'm doing this merge through here so we have a log of what's going on. Let's hope it goes well @MrMaksimize :smile: