Upstream changes to scons support from IMVU.
Merge pull request #2195 from waywardmonkeys/upstream-scons-changes

Upstream scons changes