[translated] 20141019
Merge pull request #1859 from barney-ro/master

[translated] 20141019