Merge of MonteCarlo branch into master
This is an ongoing MR to track what needs to be merged into master from the MonteCarlo branch.
MRs which have gone into this (please update):
- !184 (merged)
- !185 (merged) (subsequently merged in to master, and rebase of MonteCarlo done)
- !186 (merged)
Edited by Philip Elson