Updated for SCons 2.3.4