translated 20141011
Merge pull request #1816 from barney-ro/master

translated 20141011