Upstream scons changes

cc: @chadaustin