Fix it

Merged Ben Gamari requested to merge wip/fix-it into master

Merge request reports