Added patch by Joachim Van der Auwera to support package level annotations