Merge 2017-patches into master

Merge request reports

Loading