Standardise

André Anjos requested to merge up-to-speed into master

Merge request reports