Merge branch 'annot' into 'master'

Convert annotations to properties

See merge request !2
5 jobs for master in 46 minutes and 17 seconds (queued for 10 minutes and 21 seconds)
Status Name Job ID Coverage
  Build
passed build_linux_27 #138362
docker

00:30:24

54.0%
passed build_linux_36 #138363
docker

00:17:27

54.0%
passed build_macosx_27 #138364
macosx

00:15:45

54.0%
passed build_macosx_36 #138365
macosx

00:13:44

54.0%
 
  Deploy
passed deploy_beta #138366
deployer

00:00:08