Fix master build
Various fixes to get things building again in master. Likely things will not run quite correctly, that will come next.
Also incorporates the fixes in !96 (closed), updated in a few place.
FYI @sponce
Edited by Christopher Rob Jones
Various fixes to get things building again in master. Likely things will not run quite correctly, that will come next.
Also incorporates the fixes in !96 (closed), updated in a few place.
FYI @sponce