Merge updates from UristMcStation

Holy crap... 652 commits???