Updated to annotator rev d7290d35c6 (from the maintenance branch)