scons updated
manual merge