Pr2427

Some unrelated changes are just because I pulled down master...