Merge pull request #6148 from geekpi/master

translated
This commit is contained in:
geekpi 2017-10-19 19:58:17 -05:00 committed by GitHub
commit 786e9a13a4