Merging branch w/ random commits ahead of master

Just ignore this.