Commenting Mauro's commit
Merge branch 'hotfix'