3.6.1 dev

Giacomo Berninirequested to merge
3.6.1-dev into master

Merge request reports