Update Annotator to f1e08bdd (maintenance branch)