Merge branch 'master' into 'master'

From pro-sd/pro-sd-ump:master into public-group/pro-sd-ump:master

See merge request !26
5 jobs for master
Status Name Job ID Coverage
  Build
canceled build-job #902

 
  Verify
canceled checkstyle-job #903

canceled pmd-job #904

 
  Test
canceled junit-test-job #905

 
  Delivery
canceled delivery-job #906