I'll have to rewrite most of this.
Merge remote-tracking branch 'origin/master'