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

This reverts commit 747244b576828b383696235d4102571c7e2bcc32.
Rebase from 'upstream'
Trimmed the branch to only the euscollada sub directory