Rich master merge from future

Christopher Rob Jonesrequested to merge
RichMasterMergeFromFuture into master

Just synchronises a few things to the current stack from the future branch. Nothing significant, but doing it hopefully to avoid future conflicts.

Merge request reports