Close #358 -- Creation of annotations on new tracks corrected.
Merge remote-tracking branch 'origin/develop' into develop