xxx
Merge branch 'master' of https://github.com/kpkhxlgy0/SublimeText2

Conflicts:
	Packages/PyV8/osx/config.json
xxx