Merge pull request #1 from EllisLab/develop

从主版本合并。