issue #1309
Merge pull request #1511 from conejoninja/1309

1309