update
Merge branch 'master' of github.com:kpdyer/fteproxy-builder

Conflicts:
	build/windows-i386/build_fteproxy.sh