Merge pull request #175 from lucko/master

Merge upstream
This commit is contained in:
kashike 2017-09-19 06:25:57 -07:00 committed by GitHub
commit a0220aa0d4

@ -1 +1 @@
Subproject commit 0eaabdf5ca6dddd2bcdd57b77d3d02bc4967105e
Subproject commit 61cb2df9f359fd56d8ec9f2946adb419dccace63