I guess I never made a README, relied on the wiki page
Merge remote-tracking branch 'upstream/master'