Merge branch 'issue17' into 'master'

Issue17

See merge request !10
Status Job ID Name Coverage
  Test
passed #4987
compile_pdf

00:03:00