Attempting to merge master...

It seems that this merge required a lot of help. Hopefully I didn't break
anything.