Renamed files to remove :: characters from the filenames in tests.  Resolving #1 in the process
Merge branch 'master' into win-file-patch