Build 8687 of branch trunk