Revert "Trimmed the branch to only the euscollada sub directory"

This reverts commit a3608c09720b5acfd06242070d3c26d15fd186c1.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the euscollada sub directory