Fix #2558
Merge pull request #1 from EllisLab/develop

Fix #2558