issue #1311
Merge pull request #1493 from conejoninja/1311

1311