modify mavericks makevars logic to only trigger once
move clang fixup to onDeferredInit
Merge remote-tracking branch: upstream/master