Merge to Master, lots of changes that should have already been there...