Merge branch 'master' into 'bugfixes'

# Conflicts:
#   pom.xml
#   src/main/java/de/monticore/lang/monticar/mpp/montimath/TeXMathPrettyPrinter.java
#   src/main/resources/templates/script.ftl
2 jobs for bugfixes in 3 minutes and 5 seconds (queued for 2 seconds)
Status Name Job ID Coverage
  Windows
passed masterJobWindows #186652
Windows10

00:02:06

 
  Linux
passed BranchJobLinux #186653

00:00:58