Initial commit
Finish v3_8_6
Merge branch 'github.com/master'

Conflicts:
	.gitignore