Merge remote-tracking branch 'upstream/master' into xcconfig_support
Merge branch 'xcconfig_support' of https://github.com/dkgi/xctool into xcconfig_support

Conflicts:
	xctool/xctool-tests/OptionsTests.m