Port to Hugo

Carl Schwanrequested to merge
work/carl/hugo into master

Merge request reports