Fixes Issue #1416
Merge remote-tracking branch 'upstream/master'
Merge pull request #1456 from diegosarmentero/master

Fixes Issue #1416