Fixed stuff that I screwed up during the merge
Merge remote-tracking branch 'origin/master'