Merge some new stuff from Git