Merge to master

Doesn't actually change any files, just bringing morgan's base to same as master...