Fix NPE in annotation deserializer
Buildserver auto merge