Fixed SCons environment varible problem
Merge branch 'develop' into no_ccol