0.3.8: 1.7.0-hunter-8
Merge branch 'master' into linux