Rebase to go1.2rc2