test 2
Merge branch 'bug-12345' of github.com:encuestame-ci/ci-test into bug-12345