.
.Merge branch 'master' of https://github.com/lizh06/builds

Conflicts:
	vcbuilds.props