0.6 to master

Merged Cássio Kirch requested to merge 0.6 into master

Merge request reports