issue #1295
Merge pull request #1520 from conejoninja/1295

issue #1295
Tests passed : http://test.madriguera.me:8080/job/RUN%20TESTS/24/console