Make R CMD build happy on Windows systems.
Merge remote-tracking branch 'upstream/master'
merge pull request; simplify vignette requirements