Added fix for old annotation formats with reversed start-stop
Merge remote-tracking branch upstream/$:{upbranch}