* commit 'beeeb788': Simplify merges of the annotation code.
Attach a file by drag & drop or click to upload
