Merge branch 'master' into 'master'

Well, here goes.

I really should've tested it more. Seems like cherry-picking commits from my big branch missed some important fixes later on.