Removing unused and windows-only references
Merge pull request #436 from SlavaRa/improvement-references

Removing unused and windows-only references
Merge branch 'master' into plugins