Merge

Just a quick housekeeping note: Gapers Block switched to a new server overnight, and there are a few lingering technical difficulties remaining to be fixed. Please bear with us.