Merge remote-tracking branch 'origin/master' into eduherminio/alwey/2…

…09-newtourn-2

Merge remote-tracking branch 'alwey/209-newtourn-2' into eduherminio/…

…alwey/209-newtourn-2-v1.3.1