Merge remote-tracking branches 'spirit', 'crybaby' and 'staging'
[profile] / bin / hacks /
2017-08-13 Mark WoodingUse a proper makefile rather than the `setup' script.