+github.0.8.4
Merge pull request #1943 from mirage/master

+github.0.8.4