Fixes from windows prod
Merge branch 'master' of http://github.com/stuporglue/solar_scripts
CompletedCatchup by subdirs