Merge branch 'annotation-colors-fix' into 'master'

draw_annotation: Respect color argument passed by user.

See merge request !43