WIP: Merge from scout into soldier
/cc @denittis @jpwhiting
This now includes !54 (merged), without which the i386 build fails (but only in soldier for some reason).
Edited by Simon McVittie
/cc @denittis @jpwhiting
This now includes !54 (merged), without which the i386 build fails (but only in soldier for some reason).