swan -> master

Merged Thomas Dobbelaere requested to merge swan into master

Merge request reports