Merge branch 'plyr-1.8-rc'
Merge remote-tracking branch 'hadley/master' into upstream