Padron bugfix

Merged Jose Luis Zanotti requested to merge Padron_Bugfix into 15.0

Merge request reports