Merge Master into Nightly

Lots of important fixes!