Add notes wrt #490. Bit wary of fixing this in 2.5, in case old 2.4 annotations jar found its way in classpath...