Some Tim's workaround for failing tests in windows.
Merge pull request #1070 from akbargumbira/develop

Some Tim's workaround for failing tests in windows.