Code Upload 16-03-2018

Merged Reviewer Intergaláctico requested to merge 8.0-stage into 8.0

Merge request reports