Buildout changes

Closed Marco Folco requested to merge buildout_changes into master

Merge request reports