+github.0.7.0
Merge pull request #1532 from mirage/master

+github.0.7.0