Merge branch 'hotfix/1.3.4'
Merge branch 'master' of https://github.com/FenixEdu/fenix