Test.bat: Commiting left over changes from yesterdays debugging.
Merge branch 'master' into secrets