broken but committing to try some rollbacks
Merge branch 'master' of https://github.com/tyjacobs/SGForWindows