Merge branch 'master' into 'devel_11.1.x'

# Conflicts:
#   annotation/src/main/java/lcsb/mapviewer/annotation/services/DrugbankHTMLParser.java
1 job for devel_11.1.x in 57 seconds (queued for 2 seconds)
Status Name Job ID Coverage
  Test
passed test_frontend #11057

00:00:57