issue #1296
Merge pull request #1543 from conejoninja/1296

1296