d2957091c4
Most of the relevant information can be found in the commit messages. r? @brson - I just wanted to make sure the make changes aren't completely bogus This would close #2400, #6517, and #6489 (although a run through incoming-full on linux would have to confirm the latter two)