Update to Annotator fa51cc61e (two-phase-and-pdf-and-plugins branch)