Remove unneeded references.
Merge remote-tracking branch 'origin/master'
Changes to allow it to work in a Win8.1 VM on my MacBook