Merge our fixes branch, which contains some fixes that didn't make it into rc2 but which we'd like in next.
