log to temp file as well so we can capture debug stuff
Merge branch 'master' into azure