Master merge!

Calleh and MVG on it again.

Next time on Master Merge. Into master!