Merge 2017-patches with master, to stay in sync

Merge request reports

Loading