Minor changes to ensure it works on Windows under SourceTree's bundled BASH environment
Merge branch 'windows-patches'